libwnck-gtk3: 3.20.1 -> 3.32.0

4 files changed, 48 insertions, 24 deletions

diff --git a/libwnck-gtk3/.footprint b/libwnck-gtk3/.footprint
index 894d63bb0..039d32acc 100644
--- a/libwnck-gtk3/.footprint
+++ b/libwnck-gtk3/.footprint
@@ -1,7 +1,7 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
--rwxr-xr-x	root/root	usr/bin/wnck-urgency-monitor
--rwxr-xr-x	root/root	usr/bin/wnckprop
+-rwxr-xr-x	root/root	usr/bin/wnck-urgency-monitor3
+-rwxr-xr-x	root/root	usr/bin/wnckprop3
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/libwnck-3.0/
 drwxr-xr-x	root/root	usr/include/libwnck-3.0/libwnck/
@@ -21,9 +21,11 @@ drwxr-xr-x	root/root	usr/include/libwnck-3.0/libwnck/
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/girepository-1.0/
 -rw-r--r--	root/root	usr/lib/girepository-1.0/Wnck-3.0.typelib
--rwxr-xr-x	root/root	usr/lib/libwnck-3.la
-lrwxrwxrwx	root/root	usr/lib/libwnck-3.so -> libwnck-3.so.0.2.2
-lrwxrwxrwx	root/root	usr/lib/libwnck-3.so.0 -> libwnck-3.so.0.2.2
--rwxr-xr-x	root/root	usr/lib/libwnck-3.so.0.2.2
+lrwxrwxrwx	root/root	usr/lib/libwnck-3.so -> libwnck-3.so.0
+lrwxrwxrwx	root/root	usr/lib/libwnck-3.so.0 -> libwnck-3.so.0.3.0
+-rwxr-xr-x	root/root	usr/lib/libwnck-3.so.0.3.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libwnck-3.0.pc
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/gir-1.0/
+-rw-r--r--	root/root	usr/share/gir-1.0/Wnck-3.0.gir
diff --git a/libwnck-gtk3/.signature b/libwnck-gtk3/.signature
index fdb6e1a48..995bdd2b5 100644
--- a/libwnck-gtk3/.signature
+++ b/libwnck-gtk3/.signature
@@ -1,5 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/QhDxAbZmBcMjZZWHaZts4ahPXZeFQ5Fe0ya5JEQhJdDUvePbJicIelG9byJJZOJysh1+swQ3ERrXEf3kpHYlQE=
-SHA256 (Pkgfile) = 8b5cf1aa4782c014f459d8f105dfdcd447837ab7a33fabac5221b90f357b98c2
-SHA256 (.footprint) = 50b158ed01b65af0e239df9b9cc9e3150a1e8d31eaf1505ebca3d815349869af
-SHA256 (libwnck-3.20.1.tar.xz) = 1cb03716bc477058dfdf3ebfa4f534de3b13b1aa067fcd064d0b7813291cba72
+RWSE3ohX2g5d/ZjCVz4SSY4CDVufIj1/8gtMOJst91/Ed7QUPzAaHbatSrw2L0jvtVtoDij4QdmIAtua3YC3/evWFvHv/q4lOwo=
+SHA256 (Pkgfile) = 90eed817df6c521b57af93b82bf429ad6758ddd29f52200e13758f5b80ab71e7
+SHA256 (.footprint) = c5722e6e8dbcf98499e734083408729356f889a53ab0d3c53da0ba2aada96b66
+SHA256 (libwnck-3.32.0.tar.xz) = 9595835cf28d0fc6af5526a18f77f2fcf3ca8c09e36741bb33915b6e69b8e3ca
+SHA256 (startup-notfication.patch) = 7c49e2a6737a0e50b877ca1059e9dcf7adae03c033b95cd1f451efb20e6bc1ec
diff --git a/libwnck-gtk3/Pkgfile b/libwnck-gtk3/Pkgfile
index 0440a3dbb..0dd93cf7a 100644
--- a/libwnck-gtk3/Pkgfile
+++ b/libwnck-gtk3/Pkgfile
@@ -1,25 +1,24 @@
 # Description: Window Navigator Construction Kit library
-# URL: https://developer.gnome.org/libwnck/
-# Maintainer: Jose V Beneyto, sepen at crux dot nu
-# Depends on: gtk3 startup-notification
+# URL: https://gitlab.gnome.org/GNOME/libwnck
+# Maintainer: Danny Rawlins, crux at romster dot me
+# Depends on: gtk3 startup-notification xorg-libxres
 
 name=libwnck-gtk3
-version=3.20.1
+version=3.32.0
 release=1
-source=(ftp://ftp.gnome.org/pub/gnome/sources/libwnck/${version%.*}/libwnck-$version.tar.xz)
+source=(https://ftp.gnome.org/pub/gnome/sources/libwnck/${version%.*}/libwnck-$version.tar.xz
+	startup-notfication.patch)
 
 build() {
-  cd libwnck-$version
+	cd libwnck-$version
 
-  rm po/*.po
-  sed -i configure \
-      -e 's/USE_NLS=yes/USE_NLS=no/' \
-      -e 's/ENABLE_NLS 1/ENABLE_NLS 0/'
+	patch -p1 -i $SRC/startup-notfication.patch
 
-  ./configure --prefix=/usr
+	meson build --prefix=/usr
+	DESTDIR=$PKG ninja -C build -j ${JOBS:-1} install
 
-  make
-  make DESTDIR=$PKG install
+	mv $PKG/usr/bin/wnck-urgency-monitor{,3}
+	mv $PKG/usr/bin/wnckprop{,3}
 
-  rm -rf $PKG/usr/share
+	rm -r $PKG/usr/share/locale
 }
diff --git a/libwnck-gtk3/startup-notfication.patch b/libwnck-gtk3/startup-notfication.patch
new file mode 100644
index 000000000..289cef0f3
--- /dev/null
+++ b/libwnck-gtk3/startup-notfication.patch
@@ -0,0 +1,22 @@
+diff --git a/meson.build b/meson.build
+index 6e35c00f77aef272a20c3d473ce50bed0206a08c..28799d8bec46aef4d1b05b44ef557cd387f48a64 100644
+--- a/meson.build
++++ b/meson.build
+@@ -43,7 +43,7 @@ pkg_deps = [
+   {'name': 'glib-2.0', 'version': '>= 2.32' },
+   {'name': 'gobject-2.0', 'version': '>= 2.13.0' },
+   {'name': 'gtk+-3.0', 'version': '>= 3.22.0' },
+-  {'name': STARTUP_NOTIFICATION_PACKAGE, 'version': '>= 0.4', 'required': get_option('startup_notification').enabled() },
++  {'name': STARTUP_NOTIFICATION_PACKAGE, 'version': '>= 0.4', 'required': get_option('startup_notification')},
+   {'name': X11_PACKAGE },
+   {'name': XRES_PACKAGE, 'required': false},
+ ]
+@@ -54,7 +54,7 @@ foreach p: pkg_deps
+   dep = dependency(pkg, version: p.get('version', []), required: required)
+   LIBWNCK_DEPS += dep
+ 
+-  if not required and dep.found()
++  if dep.found()
+     conf.set('HAVE_' + pkg.to_upper().underscorify(), 1)
+   endif
+ endforeach