From 878952220772d2dfcf1f9b3969334e2678d39448 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 4 Mar 2024 23:40:17 +0700 Subject: [PATCH 1/9] exempi: update to 2.6.5. --- srcpkgs/exempi/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/exempi/template b/srcpkgs/exempi/template index c710dba74fdc18..8ffe7d52b00520 100644 --- a/srcpkgs/exempi/template +++ b/srcpkgs/exempi/template @@ -1,6 +1,6 @@ # Template file for 'exempi' pkgname=exempi -version=2.6.4 +version=2.6.5 revision=1 build_style=gnu-configure configure_args="--with-boost=${XBPS_CROSS_BASE}/usr --disable-static --disable-unittest" @@ -10,7 +10,7 @@ maintainer="Orphaned " license="BSD-3-Clause" homepage="https://libopenraw.freedesktop.org/exempi/" distfiles="https://libopenraw.freedesktop.org/download/exempi-${version}.tar.xz" -checksum=fa9c2456bf570172f0877c4eb13cd204c62ae1fdf65c3d6b71b41d88e1066f84 +checksum=ff538114e82c51e5287064dfbec7d9790ac91479bf2390bcc6408fad4d77fb12 post_install() { vlicense COPYING From 45665b4e77bbda1b1c12f28e2ea3f08c7d6e74c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 19 Apr 2024 21:15:07 +0700 Subject: [PATCH 2/9] libchamplain: update to 0.12.21. --- common/shlibs | 4 ++-- srcpkgs/libchamplain/template | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common/shlibs b/common/shlibs index 531f1431305d49..60d9ab9d331b67 100644 --- a/common/shlibs +++ b/common/shlibs @@ -825,8 +825,8 @@ libgupnp-igd-1.6.so.0 gupnp-igd-1.4.0_1 libtelepathy-logger.so.3 telepathy-logger-0.6.0_1 libmission-control-plugins.so.0 telepathy-mission-control-5.9.2_1 libclutter-gtk-1.0.so.0 clutter-gtk-1.1.2_1 -libchamplain-0.12.so.0 libchamplain-0.12.5_2 -libchamplain-gtk-0.12.so.0 libchamplain-0.12.5_2 +libchamplain-0.12.so.0 libchamplain-0.12.21_1 +libchamplain-gtk-0.12.so.0 libchamplain-0.12.21_1 libshumate-1.0.so.1 libshumate-1.0.0_1 libvpx.so.8 libvpx-1.13.0_1 libatspi.so.0 at-spi2-core-1.91.91_1 diff --git a/srcpkgs/libchamplain/template b/srcpkgs/libchamplain/template index 6face0a424a508..6497bea6479af1 100644 --- a/srcpkgs/libchamplain/template +++ b/srcpkgs/libchamplain/template @@ -1,18 +1,18 @@ # Template file for 'libchamplain' pkgname=libchamplain -version=0.12.20 +version=0.12.21 revision=1 build_style=meson build_helper="gir" configure_args="$(vopt_bool gir introspection) $(vopt_bool gir vapi)" hostmakedepends="pkg-config glib-devel $(vopt_if gir vala)" -makedepends="libsoup-gnome-devel gtk+3-devel clutter-gtk-devel sqlite-devel" +makedepends="libsoup3-devel gtk+3-devel clutter-gtk-devel sqlite-devel" short_desc="Library aimed to provide a Clutter widget to display rasterized maps" maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="http://projects.gnome.org/libchamplain/" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=0232b4bfcd130a1c5bda7b6aec266bf2d06e701e8093df1886f1e26bc1ba3066 +checksum=a915cd172a0c52944c5579fcb4683f8a878c571bf5e928254b5dafefc727e5a7 # Package build options build_options="gir" @@ -20,7 +20,7 @@ build_options_default="gir" libchamplain-devel_package() { depends="${sourcepkg}>=${version}_${revision} libglib-devel cairo-devel - clutter-devel clutter-gtk-devel gtk+3-devel sqlite-devel libsoup-devel" + clutter-devel clutter-gtk-devel gtk+3-devel sqlite-devel libsoup3-devel" short_desc+=" - development files" pkg_install() { vmove usr/include From d17c75f296290937b6a04d6d9e0fed38c2931669 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 19 Apr 2024 21:18:23 +0700 Subject: [PATCH 3/9] shotwell: update to 0.32.6. --- srcpkgs/shotwell/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/shotwell/template b/srcpkgs/shotwell/template index 60ee544de0be70..7ea0868f00137b 100644 --- a/srcpkgs/shotwell/template +++ b/srcpkgs/shotwell/template @@ -1,7 +1,7 @@ # Template file for 'shotwell' pkgname=shotwell -version=0.32.1 -revision=2 +version=0.32.6 +revision=1 build_style=meson hostmakedepends="gcr-devel gettext glib-devel itstool libgee-devel libgexiv2-devel pkg-config vala-devel" @@ -17,7 +17,7 @@ license="LGPL-2.1-or-later, CC-BY-SA-3.0" homepage="https://wiki.gnome.org/Apps/Shotwell" changelog="https://gitlab.gnome.org/GNOME/shotwell/-/raw/master/NEWS" distfiles="${GNOME_SITE}/shotwell/${version%.*}/shotwell-${version}.tar.xz" -checksum=4ac4517416ad8aa23b44e75c34bd6e16bab7363fa20991bb09bacdfab3f763ce +checksum=7597a4ffac91e18cd8144b12f2d08313a3f405bb368243a7326826f7d92a70b6 lib32disabled=yes post_extract() { From 733125656c80d575dbdec9d939f17d74b92c24fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 19 Apr 2024 21:22:02 +0700 Subject: [PATCH 4/9] io.elementary.calendar: update to 7.0.0. --- .../patches/00-musl.patch | 32 +++- .../01-fix-build-without-locale-command.patch | 32 ---- .../patches/libsoup3.patch | 137 ------------------ srcpkgs/io.elementary.calendar/template | 7 +- 4 files changed, 30 insertions(+), 178 deletions(-) delete mode 100644 srcpkgs/io.elementary.calendar/patches/01-fix-build-without-locale-command.patch delete mode 100644 srcpkgs/io.elementary.calendar/patches/libsoup3.patch diff --git a/srcpkgs/io.elementary.calendar/patches/00-musl.patch b/srcpkgs/io.elementary.calendar/patches/00-musl.patch index 9b50a7e6e259a1..29710e62b811d8 100644 --- a/srcpkgs/io.elementary.calendar/patches/00-musl.patch +++ b/srcpkgs/io.elementary.calendar/patches/00-musl.patch @@ -1,6 +1,6 @@ --- a/core/Services/Calendar/EventStore.vala +++ b/core/Services/Calendar/EventStore.vala -@@ -304,6 +304,7 @@ public class Calendar.EventStore : Object { +@@ -292,6 +292,7 @@ public class Calendar.EventStore : Objec // number we want, so we convert the pointer address to a uint to get // the data. Since the pointer address is actually data, using it as a // pointer will segfault. @@ -8,7 +8,7 @@ uint week_day1 = (uint) Posix.NLTime.WEEK_1STDAY.to_string (); var week_1stday = 0; // Default to 0 if unrecognized data if (week_day1 == 19971130) { // Sunday -@@ -313,6 +314,9 @@ public class Calendar.EventStore : Object { +@@ -301,6 +302,9 @@ public class Calendar.EventStore : Objec } else { warning ("Unknown value of _NL_TIME_WEEK_1STDAY: %u", week_day1); } @@ -18,7 +18,7 @@ /* The offset between GLib and local POSIX numbering. * If week_1stday is Monday, data is correct for GLib: Monday=1 through Sunday=7, * so offset is 0. -@@ -323,7 +327,11 @@ public class Calendar.EventStore : Object { +@@ -311,7 +315,11 @@ public class Calendar.EventStore : Objec // Get the start of week // HACK This line produces a string of 3 bytes. It takes the raw value // of the first one and uses that as the value of week_start. @@ -32,9 +32,9 @@ if (week_start == 0) { // Sunday special case --- a/meson.build +++ b/meson.build -@@ -48,7 +48,14 @@ else - add_project_arguments('--vapidir', join_paths(meson.current_source_dir(), 'vapi'), language: 'vala') - endif +@@ -56,7 +56,14 @@ libportal_dep = [ dependency('libportal' + + add_project_arguments('-DLIBICAL_GLIB_UNSTABLE_API=1', language: 'c') -m_dep = meson.get_compiler('c').find_library('m', required : false) +cc = meson.get_compiler('c') @@ -48,3 +48,23 @@ gresource_calendar = gnome.compile_resources( 'gresource_calendar', +--- a/core/Tests/meson.build ++++ b/core/Tests/meson.build +@@ -19,7 +19,11 @@ util_tests = executable( + test('Utils Tests', util_tests, suite: 'core', is_parallel: false) + + # We need these three locales to run the tests +-locales = run_command('locale', '-a', check: true).stdout().split('\n') ++locale_bin = find_program('locale', required: false) ++if not locale_bin.found() ++message('EventStore Tests have been disabled, no locale.') ++else ++locales = run_command(locale_bin, '-a', check: true).stdout().split('\n') + if locales.contains ('en_GB.utf8') and locales.contains ('en_US.utf8') and locales.contains ('ar_AE.utf8') + eventstore_tests = executable( + tests_name + '-eventstore', +@@ -30,3 +34,4 @@ if locales.contains ('en_GB.utf8') and l + else + message('EventStore Tests have been disabled, a locale is missing in the system.') + endif ++endif diff --git a/srcpkgs/io.elementary.calendar/patches/01-fix-build-without-locale-command.patch b/srcpkgs/io.elementary.calendar/patches/01-fix-build-without-locale-command.patch deleted file mode 100644 index 6513e4c5422be0..00000000000000 --- a/srcpkgs/io.elementary.calendar/patches/01-fix-build-without-locale-command.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/core/Tests/meson.build -+++ b/core/Tests/meson.build -@@ -18,15 +18,20 @@ util_tests = executable( - ) - test('Utils Tests', util_tests, suite: 'core', is_parallel: false) - -+locale_prog = find_program('locale', required: false) - # We need these three locales to run the tests --locales = run_command('locale', '-a').stdout().split('\n') --if locales.contains ('en_GB.utf8') and locales.contains ('en_US.utf8') and locales.contains ('ar_AE.utf8') -- eventstore_tests = executable( -- tests_name + '-eventstore', -- 'eventstore-tests.vala', -- dependencies: tests_deps -- ) -- test('EventStore Tests', eventstore_tests, suite: 'core', is_parallel: false) -+if locale_prog.found() -+ locales = run_command(locale_prog, '-a').stdout().split('\n') -+ if locales.contains ('en_GB.utf8') and locales.contains ('en_US.utf8') and locales.contains ('ar_AE.utf8') -+ eventstore_tests = executable( -+ tests_name + '-eventstore', -+ 'eventstore-tests.vala', -+ dependencies: tests_deps -+ ) -+ test('EventStore Tests', eventstore_tests, suite: 'core', is_parallel: false) -+ else -+ message('EventStore Tests have been disabled, a locale is missing in the system.') -+ endif - else --message('EventStore Tests have been disabled, a locale is missing in the system.') -+ message('EventStore Tests have been disabled, the locale command is missing in the system.') - endif diff --git a/srcpkgs/io.elementary.calendar/patches/libsoup3.patch b/srcpkgs/io.elementary.calendar/patches/libsoup3.patch deleted file mode 100644 index 61659b902cba3d..00000000000000 --- a/srcpkgs/io.elementary.calendar/patches/libsoup3.patch +++ /dev/null @@ -1,137 +0,0 @@ -From 62c20e5786accd68b96c423b04e32c043e726cac Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Corentin=20No=C3=ABl?= -Date: Sun, 7 Aug 2022 21:18:35 +0200 -Subject: [PATCH] Add support for Evolution Data Server 3.46 - -EDS 3.46 has switched to libsoup-3 - -Co-authored-by: Bobby Rong ---- - meson.build | 10 ++++++++-- - plugins/CalDAV/CalDAVBackend.vala | 12 ++++++++++++ - plugins/Google/GoogleBackend.vala | 26 ++++++++++++++++++++++++++ - 3 files changed, 46 insertions(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index ff7a2d0f9..703a9686d 100644 ---- a/meson.build -+++ b/meson.build -@@ -28,14 +28,20 @@ gtk_dep = dependency('gtk+-3.0', version: '>=3.22') - handy_dep = dependency('libhandy-1', version: '>=0.90.0') - libedataserver_dep = dependency('libedataserver-1.2', version: '>=3.8.0') - libedataserverui_dep = dependency('libedataserverui-1.2', version: '>=3.8.0') --libsoup_dep = dependency('libsoup-2.4') -+if (libedataserver_dep.version().version_compare ('>=3.46')) -+ libsoup_dep = [] -+ geocode_glib_dep = dependency('geocode-glib-2.0') -+ add_project_arguments('--define', 'HAS_EDS_3_46', language: 'vala') -+else -+ geocode_glib_dep = dependency('geocode-glib-1.0') -+ libsoup_dep = dependency('libsoup-2.4') -+endif - gmodule_dep = dependency('gmodule-2.0') - champlain_dep = dependency('champlain-0.12') - champlain_gtk_dep = dependency('champlain-gtk-0.12') - clutter_dep = dependency('clutter-1.0') - clutter_gtk_dep = dependency('clutter-gtk-1.0') - folks_dep = dependency('folks') --geocode_glib_dep = dependency('geocode-glib-1.0') - gclue_dep = dependency('libgeoclue-2.0') - libecal_dep = dependency('libecal-2.0') - libical_dep = dependency('libical-glib') -diff --git a/plugins/CalDAV/CalDAVBackend.vala b/plugins/CalDAV/CalDAVBackend.vala -index e1f6fde53..e4f5e0f5c 100644 ---- a/plugins/CalDAV/CalDAVBackend.vala -+++ b/plugins/CalDAV/CalDAVBackend.vala -@@ -73,7 +73,11 @@ public class Maya.CalDavBackend : GLib.Object, Maya.Backend { - collection.add (url_entry); - if (to_edit != null) { - E.SourceWebdav webdav = (E.SourceWebdav)to_edit.get_extension (E.SOURCE_EXTENSION_WEBDAV_BACKEND); -+#if HAS_EDS_3_46 -+ var uri = webdav.dup_uri (); -+#else - var uri = webdav.dup_soup_uri (); -+#endif - if (uri.get_port () != 80) { - ((Gtk.Entry)url_entry.widget).text = "%s://%s:%u%s".printf (uri.get_scheme (), uri.get_host (), uri.get_port (), uri.get_path ()); - } else { -@@ -147,7 +151,11 @@ public class Maya.CalDavBackend : GLib.Object, Maya.Backend { - foreach (var widget in widgets) { - switch (widget.ref_name) { - case "url_entry": -+#if HAS_EDS_3_46 -+ webdav.uri = GLib.Uri.parse (((Gtk.Entry)widget.widget).text, GLib.UriFlags.NONE); -+#else - webdav.soup_uri = new Soup.URI (((Gtk.Entry)widget.widget).text); -+#endif - break; - case "user_entry": - auth.user = ((Gtk.Entry)widget.widget).text; -@@ -190,7 +198,11 @@ public class Maya.CalDavBackend : GLib.Object, Maya.Backend { - foreach (var widget in widgets) { - switch (widget.ref_name) { - case "url_entry": -+#if HAS_EDS_3_46 -+ webdav.uri = GLib.Uri.parse (((Gtk.Entry)widget.widget).text, GLib.UriFlags.NONE); -+#else - webdav.soup_uri = new Soup.URI (((Gtk.Entry)widget.widget).text); -+#endif - break; - case "user_entry": - auth.user = ((Gtk.Entry)widget.widget).text; -diff --git a/plugins/Google/GoogleBackend.vala b/plugins/Google/GoogleBackend.vala -index 2f9fa3f2b..3f77bd13b 100644 ---- a/plugins/Google/GoogleBackend.vala -+++ b/plugins/Google/GoogleBackend.vala -@@ -83,12 +83,25 @@ public class Maya.GoogleBackend : GLib.Object, Maya.Backend { - } - - auth.user = decoded_user; -+#if HAS_EDS_3_46 -+ webdav.uri = GLib.Uri.build ( -+ GLib.UriFlags.NONE, -+ "https", -+ null, -+ "www.google.com", -+ -1, -+ "/calendar/dav/%s/events".printf (decoded_user), -+ null, -+ null -+ ); -+#else - var soup_uri = new Soup.URI (null); - soup_uri.set_host ("www.google.com"); - soup_uri.set_scheme ("https"); - soup_uri.set_user (decoded_user); - soup_uri.set_path ("/calendar/dav/%s/events".printf (decoded_user)); - webdav.soup_uri = soup_uri; -+#endif - break; - case "keep_copy": - offline.set_stay_synchronized (((Gtk.CheckButton)widget.widget).active); -@@ -128,12 +141,25 @@ public class Maya.GoogleBackend : GLib.Object, Maya.Backend { - } - - auth.user = decoded_user; -+#if HAS_EDS_3_46 -+ webdav.uri = GLib.Uri.build ( -+ GLib.UriFlags.NONE, -+ "https", -+ null, -+ "www.google.com", -+ -1, -+ "/calendar/dav/%s/events".printf (decoded_user), -+ null, -+ null -+ ); -+#else - var soup_uri = new Soup.URI (null); - soup_uri.set_host ("www.google.com"); - soup_uri.set_scheme ("https"); - soup_uri.set_user (decoded_user); - soup_uri.set_path ("/calendar/dav/%s/events".printf (decoded_user)); - webdav.soup_uri = soup_uri; -+#endif - break; - case "keep_copy": - offline.set_stay_synchronized (((Gtk.CheckButton)widget.widget).active); diff --git a/srcpkgs/io.elementary.calendar/template b/srcpkgs/io.elementary.calendar/template index f6e18119ad8561..d9b98f97e1bb67 100644 --- a/srcpkgs/io.elementary.calendar/template +++ b/srcpkgs/io.elementary.calendar/template @@ -1,12 +1,13 @@ # Template file for 'io.elementary.calendar' pkgname=io.elementary.calendar -version=6.1.2 -revision=2 +version=7.0.0 +revision=1 build_style=meson build_helper="gir" hostmakedepends="gettext pkg-config vala desktop-file-utils AppStream glib-devel evolution-data-server-devel" makedepends="granite-devel libglib-devel gtk+3-devel libgee08-devel + libportal-devel libportal-gtk3-devel libchamplain-devel clutter-devel evolution-data-server-devel libhandy1-devel folks-devel geocode-glib-devel geoclue2-devel libical-devel libnotify-devel" short_desc="Desktop calendar app designed for elementary OS" @@ -14,7 +15,7 @@ maintainer="Cameron Nemo " license="GPL-3.0-only" homepage="https://github.com/elementary/calendar" distfiles="https://github.com/elementary/calendar/archive/refs/tags/${version}.tar.gz" -checksum=4051f4d190d2144054c3fb637e53281850a7db858771d73adf157c914dba8f31 +checksum=389a46896b8cf883ef30cf60eab9edd397cfa38a2375164f833921b1ff72aefc libio.elementary.calendar_package() { short_desc+=" - library" From 9be513382add556212c2d63152356433c0dbe5b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 19 Apr 2024 21:26:44 +0700 Subject: [PATCH 5/9] gthumb: rebuild for champlain --- srcpkgs/gthumb/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gthumb/template b/srcpkgs/gthumb/template index 4655584ab76850..2abdf0d3beb24e 100644 --- a/srcpkgs/gthumb/template +++ b/srcpkgs/gthumb/template @@ -1,9 +1,9 @@ # Template file for 'gthumb' pkgname=gthumb version=3.12.6 -revision=1 +revision=2 build_style=meson -configure_args="-Dwebservices=false" +configure_args="-Dwebservices=false -Dlibchamplain=true" hostmakedepends="gettext pkg-config itstool glib-devel" makedepends="json-glib-devel libsecret-devel librsvg-devel libwebp-devel exiv2-devel gtk+3-devel libraw-devel libchamplain-devel From 324e33b9cd797da98f2da4d33d32379ef4321098 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 19 Apr 2024 21:31:14 +0700 Subject: [PATCH 6/9] gnome-contacts: no longer needs libchamplain --- srcpkgs/gnome-contacts/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template index e27ff395bf536e..8cdd7cc228e4d2 100644 --- a/srcpkgs/gnome-contacts/template +++ b/srcpkgs/gnome-contacts/template @@ -5,7 +5,7 @@ revision=1 build_style=meson hostmakedepends="docbook-xsl folks-devel gettext glib-devel libxslt pkg-config vala" makedepends="cheese-devel folks-devel gnome-desktop-devel libportal-gtk4-devel - libchamplain-devel libnotify-devel vala-devel gtk4-devel libadwaita-devel qrencode-devel" + libnotify-devel vala-devel gtk4-devel libadwaita-devel qrencode-devel" depends="desktop-file-utils" short_desc="GNOME contacts manager" maintainer="Enno Boland " From 6ad041fd3352c9bc8c2d219d76e37a1c578a9e18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 19 Apr 2024 21:50:14 +0700 Subject: [PATCH 7/9] eog-plugins: update to 44.0. --- srcpkgs/eog-plugins/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/eog-plugins/template b/srcpkgs/eog-plugins/template index 05924e18bfbd37..317b24e4e623b8 100644 --- a/srcpkgs/eog-plugins/template +++ b/srcpkgs/eog-plugins/template @@ -1,7 +1,7 @@ # Template file for 'eog-plugins' pkgname=eog-plugins -version=42.2 -revision=3 +version=44.0 +revision=1 build_style=meson pycompile_dirs="usr/lib/eog/plugins" hostmakedepends="glib-devel pkg-config gettext" @@ -15,6 +15,6 @@ license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins" changelog="https://gitlab.gnome.org/GNOME/eog-plugins/-/raw/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=604c6b57c72a680a62837dd735223be6e7b79e47cf75c92af9d12048db72918b +checksum=db31cbf7bb9652db0a87113e9b51f4df2586763a261b0cbf04327d82cb38b047 python_version=3 lib32disabled=yes From 96f6069e98b12189bbcb01c357dcafa2fd517fbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 19 Apr 2024 21:35:34 +0700 Subject: [PATCH 8/9] New package: fotocx-24.21 --- srcpkgs/fotocx/patches/musl.patch | 73 +++++++++++++++++++++++++ srcpkgs/fotocx/template | 22 ++++++++ srcpkgs/{fotoxx => fotocx}/update | 0 srcpkgs/fotoxx | 1 + srcpkgs/fotoxx/patches/execinfo.patch | 17 ------ srcpkgs/fotoxx/patches/musl_build.patch | 13 ----- srcpkgs/fotoxx/template | 26 --------- 7 files changed, 96 insertions(+), 56 deletions(-) create mode 100644 srcpkgs/fotocx/patches/musl.patch create mode 100644 srcpkgs/fotocx/template rename srcpkgs/{fotoxx => fotocx}/update (100%) create mode 120000 srcpkgs/fotoxx delete mode 100644 srcpkgs/fotoxx/patches/execinfo.patch delete mode 100644 srcpkgs/fotoxx/patches/musl_build.patch delete mode 100644 srcpkgs/fotoxx/template diff --git a/srcpkgs/fotocx/patches/musl.patch b/srcpkgs/fotocx/patches/musl.patch new file mode 100644 index 00000000000000..f4a55b7ece7b70 --- /dev/null +++ b/srcpkgs/fotocx/patches/musl.patch @@ -0,0 +1,73 @@ +--- a/zfuncs.cc ++++ b/zfuncs.cc +@@ -19,6 +19,9 @@ + *********************************************************************************/ + + #include "zfuncs.h" ++#ifdef __GLIBC__ ++#include ++#endif + + /******************************************************************************** + +@@ -714,12 +717,14 @@ void zexit(int popup, ch *errmess, ...) + + void zbacktrace() + { ++#ifdef __GLIBC__ + int nstack = 100; + void *stacklist[100]; + + nstack = backtrace(stacklist,nstack); // get backtrace data + if (nstack > 100) nstack = 100; + backtrace_symbols_fd(stacklist,nstack,STDOUT_FILENO); // backtrace records to STDOUT ++#endif + + return; + } +@@ -766,7 +771,11 @@ void zappcrash(ch *format, ... ) + arch, OS2, OS3, zappvers, build_date_time, message); + Plog(0,"*** zappcrash context: %s | %s \n",zappcrash_context1, zappcrash_context2); + ++#ifdef __GLIBC__ + nstack = backtrace(stacklist,nstack); // get backtrace data ++#else ++ nstack = 0; ++#endif + if (nstack <= 0) zexit(0,"zappcrash backtrace() failure"); + if (nstack > 100) nstack = 100; + +@@ -774,7 +783,9 @@ void zappcrash(ch *format, ... ) + if (! fid1) zexit(0,"zappcrash fopen() failure"); + + fd = fileno(fid1); ++#ifdef __GLIBC__ + backtrace_symbols_fd(stacklist,nstack,fd); // write backtrace data ++#endif + fclose(fid1); // (use of malloc() is avoided) + + fid1 = fopen("zbacktrace","r"); // open backtrace data file +--- a/f.file.cc ++++ b/f.file.cc +@@ -3755,9 +3755,10 @@ int find_imagefiles(ch *folder, int flag + if (flags & 16) Frecurse = 1; + if (flags & 32) Fnolinks = 1; + ++#ifdef GLOB_ONLYDIR + if (Fdirs && ! Fimages && ! Fthumbs) + globflags += GLOB_ONLYDIR; +- ++#endif + globdata.gl_pathc = 0; // glob() setup + globdata.gl_offs = 0; + globdata.gl_pathc = 0; +--- a/zfuncs.h ++++ b/zfuncs.h +@@ -37,7 +37,6 @@ + #include + #include + #include +-#include + #include + #include + #include diff --git a/srcpkgs/fotocx/template b/srcpkgs/fotocx/template new file mode 100644 index 00000000000000..aa6a8587ef6757 --- /dev/null +++ b/srcpkgs/fotocx/template @@ -0,0 +1,22 @@ +# Template file for 'fotocx' +pkgname=fotocx +version=24.21 +revision=1 +build_style=gnu-makefile +make_use_env=yes +hostmakedepends="pkg-config" +makedepends="libchamplain-devel" +depends="desktop-file-utils exiftool xdg-utils dcraw" +short_desc="Free open source program for image editing and collection management" +maintainer="Benjamín Albiñana " +license="GPL-3.0-or-later" +homepage="https://www.kornelix.net/fotocx/fotocx.html" +changelog="https://www.kornelix.net/downloads/recent_changes.txt" +distfiles="https://www.kornelix.net/downloads/downloads/fotocx-${version}-source.tar.gz" +checksum=0acb68e32956a3f1b2a28025e42d35e5072403e6183ffa1de5cebc3e09a6f32c + +fotoxx_package() { + build_style=meta + depends="fotocx" + short_desc+=" - old package" +} diff --git a/srcpkgs/fotoxx/update b/srcpkgs/fotocx/update similarity index 100% rename from srcpkgs/fotoxx/update rename to srcpkgs/fotocx/update diff --git a/srcpkgs/fotoxx b/srcpkgs/fotoxx new file mode 120000 index 00000000000000..808be4b6d6c6ca --- /dev/null +++ b/srcpkgs/fotoxx @@ -0,0 +1 @@ +fotocx \ No newline at end of file diff --git a/srcpkgs/fotoxx/patches/execinfo.patch b/srcpkgs/fotoxx/patches/execinfo.patch deleted file mode 100644 index c228f35af228a7..00000000000000 --- a/srcpkgs/fotoxx/patches/execinfo.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git Makefile Makefile -index 218aa2d..77ec75e 100644 ---- a/Makefile -+++ b/Makefile -@@ -47,4 +47,4 @@ CFLAGS = $(CXXFLAGS) $(CPPFLAGS) -c \ - -I/usr/include/libchamplain-0.12/ - --LIBS = `$(PKG_CONFIG) --libs gtk+-3.0` \ -+LIBS = `$(PKG_CONFIG) --libs gtk+-3.0` $(shell pkg-config --libs libexecinfo) \ - -lclutter-1.0 -lclutter-gtk-1.0 -lchamplain-0.12 -lchamplain-gtk-0.12 - - ALLFILES = fotoxx.o f.widgets.o f.file.o f.gallery.o f.albums.o f.area.o f.meta.o \ -@@ -146,4 +146,3 @@ uninstall: - clean: - rm -f fotoxx - rm -f *.o -- diff --git a/srcpkgs/fotoxx/patches/musl_build.patch b/srcpkgs/fotoxx/patches/musl_build.patch deleted file mode 100644 index f42dda8d82fc77..00000000000000 --- a/srcpkgs/fotoxx/patches/musl_build.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git f.file.cc f.file.cc -index 7c4f083..f2c9c07 100644 ---- a/f.file.cc -+++ b/f.file.cc -@@ -3493,6 +3493,7 @@ int find_imagefiles(cchar *folder, int flags, char **&flist, int &NF, int Finit) -+#ifdef GLOB_ONLYDIR - if (Fdirs && ! Fimages && ! Fthumbs) - globflags += GLOB_ONLYDIR; -- -+#endif - globdata.gl_pathc = 0; // glob() setup - globdata.gl_offs = 0; - globdata.gl_pathc = 0; diff --git a/srcpkgs/fotoxx/template b/srcpkgs/fotoxx/template deleted file mode 100644 index efedd8ea06b65b..00000000000000 --- a/srcpkgs/fotoxx/template +++ /dev/null @@ -1,26 +0,0 @@ -# Template file for 'fotoxx' -pkgname=fotoxx -version=23.74 -revision=1 -build_style=gnu-makefile -make_use_env=yes -hostmakedepends="pkg-config" -makedepends="libchamplain-devel" -depends="desktop-file-utils exiftool xdg-utils dcraw" -short_desc="Free open source program for image editing and collection management" -maintainer="Benjamín Albiñana " -license="GPL-3.0-or-later" -homepage="https://www.kornelix.net/fotoxx/fotoxx.html" -changelog="https://www.kornelix.net/downloads/recent_changes.txt" -distfiles="https://www.kornelix.net/downloads/downloads/fotoxx-${version}-source.tar.gz" -checksum=f0dc0879d448f743d7df38ef8d7ef865abe5feb730809267d83fb278f8e92476 - -CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/champlain-0.12" - -if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" libchamplain-devel" -fi - -case "$XBPS_TARGET_LIBC" in - musl) makedepends+=" libexecinfo-devel" -esac From e6ce1b9d58bf97fca4fb288aebb95d6bfd0f5239 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 20 Apr 2024 12:51:31 +0700 Subject: [PATCH 9/9] abiword: enable gobject-introspection --- srcpkgs/abiword/patches/libxml-2.12.patch | 29 +++++++++++++++++++++++ srcpkgs/abiword/patches/musl.patch | 18 +++++++++++--- srcpkgs/abiword/template | 11 ++++++--- 3 files changed, 52 insertions(+), 6 deletions(-) create mode 100644 srcpkgs/abiword/patches/libxml-2.12.patch diff --git a/srcpkgs/abiword/patches/libxml-2.12.patch b/srcpkgs/abiword/patches/libxml-2.12.patch new file mode 100644 index 00000000000000..2c364224898138 --- /dev/null +++ b/srcpkgs/abiword/patches/libxml-2.12.patch @@ -0,0 +1,29 @@ +From 2a06be6a10a0718f8a3d8e00c317f5042c99a467 Mon Sep 17 00:00:00 2001 +From: Jan Tojnar +Date: Mon, 11 Dec 2023 01:55:53 +0100 +Subject: [PATCH] Fix build with libxml2 2.12 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +libxml 2.12.0 restructured headers so that xmlFree is no longer in the scope. +Let’s add the correct include. +--- + src/af/util/xp/ut_stringbuf.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/af/util/xp/ut_stringbuf.cpp b/src/af/util/xp/ut_stringbuf.cpp +index f1e8d9078..88488ad67 100644 +--- a/src/af/util/xp/ut_stringbuf.cpp ++++ b/src/af/util/xp/ut_stringbuf.cpp +@@ -26,6 +26,7 @@ + #include + + #include ++#include + + #include + +-- +GitLab + diff --git a/srcpkgs/abiword/patches/musl.patch b/srcpkgs/abiword/patches/musl.patch index 50c055ffe3c4da..b440d4fdce0549 100644 --- a/srcpkgs/abiword/patches/musl.patch +++ b/srcpkgs/abiword/patches/musl.patch @@ -1,6 +1,6 @@ ---- a/src/af/xap/xp/xap_Dialog.cpp 2021-07-03 17:46:07.000000000 +0200 -+++ - 2023-02-23 13:21:03.557255506 +0100 -@@ -267,7 +267,7 @@ +--- a/src/af/xap/xp/xap_Dialog.cpp ++++ b/src/af/xap/xp/xap_Dialog.cpp +@@ -267,7 +267,7 @@ XAP_Dialog_Modeless::BuildWindowName(cha // This function constructs and returns the window name of a modeless dialog by // concatenating the active frame with the dialog name @@ -9,3 +9,15 @@ UT_UTF8String wn = UT_UTF8String(pDialogName); XAP_Frame* pFrame = getActiveFrame(); +--- a/src/af/util/xp/t/ut_locale.t.cpp ++++ b/src/af/util/xp/t/ut_locale.t.cpp +@@ -29,6 +29,9 @@ + TFTEST_MAIN("UT_LocaleTransactor") + { + char msg[128]; ++#ifndef __GLIBC__ ++ return; ++#endif + if (setlocale(LC_ALL, "fr_FR") == NULL) + { + printf("Test skipped, fr_FR locale is unknown on this system\n"); diff --git a/srcpkgs/abiword/template b/srcpkgs/abiword/template index 9dc643e5c05df0..32f8a12bcaba87 100644 --- a/srcpkgs/abiword/template +++ b/srcpkgs/abiword/template @@ -1,10 +1,12 @@ # Template file for 'abiword' pkgname=abiword version=3.0.5 -revision=1 +revision=2 build_style=gnu-configure -configure_args="--enable-plugins --enable-clipart --enable-templates" -hostmakedepends="automake libtool flex pkg-config" +build_helper=gir +configure_args="--enable-plugins --enable-clipart --enable-templates + --enable-introspection" +hostmakedepends="automake libtool flex pkg-config gobject-introspection" makedepends="libjpeg-turbo-devel libpng-devel fribidi-devel libgsf-devel enchant2-devel librsvg-devel wv-devel boost-devel libxslt-devel libwmf-devel $(vopt_if champlain libchamplain-devel) redland-devel libical-devel @@ -16,6 +18,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="http://www.abisource.com/" distfiles="${homepage}/downloads/${pkgname}/${version}/source/${pkgname}-${version}.tar.gz" +distfiles="https://sources.voidlinux.org/abiword-${version}/abiword-${version}.tar.gz" checksum=1257247e9970508d6d1456d3e330cd1909c4b42b25e0f0a1bc32526d6f3a21b4 build_options="goffice champlain" @@ -27,6 +30,7 @@ libabiword_package() { short_desc+=" - Runtime library" pkg_install() { vmove "usr/lib/*.so*" + vmove "usr/lib/girepository*" } } abiword-devel_package() { @@ -36,5 +40,6 @@ abiword-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig + vmove "usr/share/gir*" } }