commit e6ed5af5e8287b29e32184f61ac29b56e4fb7f25 Author: Tim Biermann <tbier@posteo.de> Date: Sat Aug 20 19:09:34 2022 +0200 glade: 3.38.2 -> 3.40.0 diff --git a/glade/.footprint b/glade/.footprint index 5736e7864..33cd56a23 100644 --- a/glade/.footprint +++ b/glade/.footprint @@ -46,10 +46,11 @@ drwxr-xr-x root/root usr/lib/girepository-1.0/ -rw-r--r-- root/root usr/lib/girepository-1.0/Gladeui-2.0.typelib drwxr-xr-x root/root usr/lib/glade/ drwxr-xr-x root/root usr/lib/glade/modules/ +-rwxr-xr-x root/root usr/lib/glade/modules/libgladeglade.so -rwxr-xr-x root/root usr/lib/glade/modules/libgladegtk.so lrwxrwxrwx root/root usr/lib/libgladeui-2.so -> libgladeui-2.so.13 -lrwxrwxrwx root/root usr/lib/libgladeui-2.so.13 -> libgladeui-2.so.13.0.2 --rwxr-xr-x root/root usr/lib/libgladeui-2.so.13.0.2 +lrwxrwxrwx root/root usr/lib/libgladeui-2.so.13 -> libgladeui-2.so.13.1.0 +-rwxr-xr-x root/root usr/lib/libgladeui-2.so.13.1.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/gladeui-2.0.pc drwxr-xr-x root/root usr/share/ @@ -64,6 +65,7 @@ drwxr-xr-x root/root usr/share/gir-1.0/ drwxr-xr-x root/root usr/share/glade/ drwxr-xr-x root/root usr/share/glade/catalogs/ -rw-r--r-- root/root usr/share/glade/catalogs/glade-catalog.dtd +-rw-r--r-- root/root usr/share/glade/catalogs/gladeui.xml -rw-r--r-- root/root usr/share/glade/catalogs/gtk+.xml -rw-r--r-- root/root usr/share/glade/catalogs/gtkunixprint.xml drwxr-xr-x root/root usr/share/glade/pixmaps/ diff --git a/glade/.signature b/glade/.signature index 9bde6d188..dc09091f5 100644 --- a/glade/.signature +++ b/glade/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF36PW+hEqTOOs8lL3yPbT0bNPuWZDQvhaDWDloz/8a/nsE0hr2eVMf/AfZl/SZUirULxcpe9+q3FArG7npKqT7AA= -SHA256 (Pkgfile) = af495b8ca34c74da6981e66db5faa8b60e5042e0a24cba4431b91aa52d7d7002 -SHA256 (.footprint) = 0e24791b66cc24de202a41bb044c1a6f32cd75c69964d49fe50da80349036f57 -SHA256 (glade-3.38.2.tar.xz) = 98fc87647d88505c97dd2f30f2db2d3e9527515b3af11694787d62a8d28fbab7 -SHA256 (glade-3.38.2-meson-0.61.patch) = 5b0fbcb7187371d4ca30989e01fc762b473e76fccc2b70ed78c7c5d469eaf42c +RWSagIOpLGJF3/2PdCWrp0VdBOJvMIakabHxU2amk6ZB/3FiMNu5i2+5HzdTQV/nzGc02Btu+kfV1cnlYuoi3mBGmzrInoRxLQE= +SHA256 (Pkgfile) = ccc3af5558258bc5ecf1f1307792d7f362c7177200f5e683c3aaf32256f9ee28 +SHA256 (.footprint) = 585a7028407439ee22f442ea338328568efed8c10b765aab60878277944d2a53 +SHA256 (glade-3.40.0.tar.xz) = 31c9adaea849972ab9517b564e19ac19977ca97758b109edc3167008f53e3d9c diff --git a/glade/Pkgfile b/glade/Pkgfile index 2f8d9b7e2..bed27ff77 100644 --- a/glade/Pkgfile +++ b/glade/Pkgfile @@ -5,14 +5,11 @@ # Optional: gtk-doc libxslt python3-gobject webkitgtk name=glade -version=3.38.2 +version=3.40.0 release=1 -source=(https://download.gnome.org/sources/$name/${version::4}/$name-$version.tar.xz - glade-3.38.2-meson-0.61.patch) +source=(https://download.gnome.org/sources/$name/${version::4}/$name-$version.tar.xz) build() { - patch -Np1 -d $name-$version -i $SRC/glade-3.38.2-meson-0.61.patch - prt-get isinst gtk-doc || PKGMK_GLADE+=' -D gtk_doc=false' prt-get isinst libxslt || PKGMK_GLADE+=' -D man=false' diff --git a/glade/glade-3.38.2-meson-0.61.patch b/glade/glade-3.38.2-meson-0.61.patch deleted file mode 100644 index 72f9c0e50..000000000 --- a/glade/glade-3.38.2-meson-0.61.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 61304b2e8bac8ded76643cb7c3e781f73881dd2b Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <floppym@gentoo.org> -Date: Thu, 20 Jan 2022 14:18:09 -0500 -Subject: [PATCH 1/2] meson: i18n.merge_file() does not take a positional - argument - ---- - data/meson.build | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index 9f244566..bfbc514c 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -2,7 +2,6 @@ desktop_conf = configuration_data() - desktop_conf.set('VERSION', glade_version) - - i18n.merge_file( -- 'desktop', - type: 'desktop', - input: configure_file( - input: 'org.gnome.Glade.desktop.in.in', -@@ -18,7 +17,6 @@ i18n.merge_file( - appdata = glade_name + '.appdata.xml' - - i18n.merge_file( -- 'appdata', - input: 'org.gnome.Glade.appdata.xml.in', - output: '@BASENAME@', - po_dir: po_dir, --- -GitLab - - -From 04ba6f969f716fbfe3c7feb7e4bab8678cc1e9eb Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <floppym@gentoo.org> -Date: Thu, 20 Jan 2022 14:19:03 -0500 -Subject: [PATCH 2/2] Remove duplicate entry for 'da' from help/LINGUAS - ---- - help/LINGUAS | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/help/LINGUAS b/help/LINGUAS -index fc3cd4c3..d67e42c8 100644 ---- a/help/LINGUAS -+++ b/help/LINGUAS -@@ -1,6 +1,5 @@ - # please keep this list sorted alphabetically - # --da - bg - ca - cs --- -GitLab -