Control: tags 908609 + patch
Control: tags 908609 + pending
Howdy,
I've prepared an NMU for gtkhash (versioned as 1.1.1-3.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.
~Unit 193
Unit193 @ freenode
Unit193 @ OFTC
diff -Nru gtkhash-1.1.1/debian/changelog gtkhash-1.1.1/debian/changelog
--- gtkhash-1.1.1/debian/changelog 2018-07-16 07:46:10.000000000 -0400
+++ gtkhash-1.1.1/debian/changelog 2018-09-24 19:12:36.000000000 -0400
@@ -1,3 +1,13 @@
+gtkhash (1.1.1-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Support thunarx-3 (Closes: #908609):
+ + d/p/11-support-thunarx-3.patch: Add upstream commit to support thunarx-3.
+ + d/control: Adjust build-dep: libthunarx-2-dev → libthunarx-3-dev.
+ + d/thunar-gtkhash.install: Adapt to the thunarx-3 path.
+
+ -- Unit 193 <unit...@ubuntu.com> Mon, 24 Sep 2018 19:12:36 -0400
+
gtkhash (1.1.1-3) unstable; urgency=medium
* Fix Vcs-*.
diff -Nru gtkhash-1.1.1/debian/control gtkhash-1.1.1/debian/control
--- gtkhash-1.1.1/debian/control 2018-07-16 07:16:59.000000000 -0400
+++ gtkhash-1.1.1/debian/control 2018-09-24 19:11:42.000000000 -0400
@@ -8,7 +8,7 @@
nettle-dev,
libgtk-3-dev (>= 3.0.0),
libnautilus-extension-dev (>= 3.0),
- libthunarx-2-dev,
+ libthunarx-3-dev,
libnemo-extension-dev,
libcaja-extension-dev,
intltool (>= 0.40.6),
diff -Nru gtkhash-1.1.1/debian/patches/50-support-thunarx-3.patch
gtkhash-1.1.1/debian/patches/50-support-thunarx-3.patch
--- gtkhash-1.1.1/debian/patches/50-support-thunarx-3.patch 1969-12-31
19:00:00.000000000 -0500
+++ gtkhash-1.1.1/debian/patches/50-support-thunarx-3.patch 2018-09-24
19:11:42.000000000 -0400
@@ -0,0 +1,54 @@
+From 9e35e3a0c248d57c62d064edbc14d3ed02c3bff8 Mon Sep 17 00:00:00 2001
+From: Tristan Heaven <tris...@tristanheaven.net>
+Date: Sun, 20 May 2018 18:02:05 +0100
+Subject: [PATCH] add --with-thunarx= configure option for selecting thunarx
+ version (fixes #21)
+
+---
+ configure.ac | 14 ++++++++++----
+ 1 file changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9b474f2..fd1f99c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -69,7 +69,7 @@ GLIB_GSETTINGS
+ # check for gtk+ {{{
+ AC_MSG_CHECKING([which GTK+ version to use])
+ AC_ARG_WITH([gtk],
+- [AS_HELP_STRING([--with-gtk=2.0|3.0], [GTK+ version to use [3.0]])],
++ [AS_HELP_STRING([--with-gtk=2.0|3.0], [GTK+ version to use
[default=3.0]])],
+ [with_gtk="${withval}"], [with_gtk="3.0"])
+ AC_MSG_RESULT([${with_gtk}])
+
+@@ -340,12 +340,18 @@ AC_ARG_ENABLE([thunar],
+ AC_MSG_RESULT([${enable_thunar}])
+ AM_CONDITIONAL([ENABLE_THUNAR], [test "${enable_thunar}" = "yes"])
+
++AC_MSG_CHECKING([which Thunarx version to use])
++AC_ARG_WITH([thunarx],
++ [AS_HELP_STRING([--with-thunarx=2|3], [Thunarx version to use
[default=3]])],
++ [with_thunar="${withval}"], [with_thunarx="3"])
++AC_MSG_RESULT([${with_thunarx}])
++
+ if test "${enable_thunar}" = "yes" ; then
+ # Check for thunar
+- PKG_CHECK_MODULES([THUNAR], [thunarx-2])
++ PKG_CHECK_MODULES([THUNAR], ["thunarx-${with_thunarx}"])
+ AC_SUBST([THUNAR_CFLAGS])
+ AC_SUBST([THUNAR_LIBS])
+- THUNAR_EXTENSION_DIR=`${PKG_CONFIG} --variable=extensionsdir thunarx-2`
++ THUNAR_EXTENSION_DIR=`${PKG_CONFIG} --variable=extensionsdir
"thunarx-${with_thunarx}"`
+ AC_SUBST([THUNAR_EXTENSION_DIR])
+ fi
+ # }}}
+@@ -392,7 +398,7 @@ echo " gtkhash: ${enable_gtkhash} (gtk+-${with_gtk})"
+ echo " gtkhash-caja: ${enable_caja}"
+ echo " gtkhash-nautilus: ${enable_nautilus}"
+ echo " gtkhash-nemo: ${enable_nemo}"
+-echo " gtkhash-thunar: ${enable_thunar}"
++echo " gtkhash-thunar: ${enable_thunar} (thunarx-${with_thunarx})"
+
+ blake2_funcs="
+ BLAKE2b BLAKE2s BLAKE2bp BLAKE2sp"
+
diff -Nru gtkhash-1.1.1/debian/patches/series
gtkhash-1.1.1/debian/patches/series
--- gtkhash-1.1.1/debian/patches/series 2018-07-16 07:14:44.000000000 -0400
+++ gtkhash-1.1.1/debian/patches/series 2018-09-24 19:11:42.000000000 -0400
@@ -2,3 +2,4 @@
20-fix-component-id.patch
30-add-image-screenshot.patch
40-fix-invalid-tags.patch
+50-support-thunarx-3.patch
diff -Nru gtkhash-1.1.1/debian/thunar-gtkhash.install
gtkhash-1.1.1/debian/thunar-gtkhash.install
--- gtkhash-1.1.1/debian/thunar-gtkhash.install 2017-12-19 02:45:34.000000000
-0500
+++ gtkhash-1.1.1/debian/thunar-gtkhash.install 2018-09-24 19:11:42.000000000
-0400
@@ -1,2 +1,2 @@
-usr/lib/*/thunarx-2/libgtkhash-properties-thunar.so
+usr/lib/*/thunarx-3/libgtkhash-properties-thunar.so
usr/share/appdata/thunar-gtkhash.metainfo.xml usr/share/metainfo
