diff options
| -rw-r--r-- | system/xarchiver/gtk_fix.diff | 30 | ||||
| -rw-r--r-- | system/xarchiver/xarchiver.SlackBuild | 18 | ||||
| -rw-r--r-- | system/xarchiver/xarchiver.info | 6 |
3 files changed, 47 insertions, 7 deletions
diff --git a/system/xarchiver/gtk_fix.diff b/system/xarchiver/gtk_fix.diff new file mode 100644 index 0000000000..7adedfe347 --- /dev/null +++ b/system/xarchiver/gtk_fix.diff @@ -0,0 +1,30 @@ +diff --git a/src/open-with-dlg.c b/src/open-with-dlg.c +index 0f42632..462b805 100644 +--- a/src/open-with-dlg.c ++++ b/src/open-with-dlg.c +@@ -119,7 +119,7 @@ static gboolean xa_open_with_dialog_mouse_button_event (GtkWidget *widget, GdkEv + return FALSE; + } + +-static void xa_destroy_open_with_dialog (GtkObject *object, Open_with_data *data) ++static void xa_destroy_open_with_dialog (GTK_COMPAT_DESTROY_TYPE object, Open_with_data *data) + { + g_free(data->files); + g_slist_foreach(data->apps, (GFunc) xa_app_free, NULL); +diff --git a/src/support.h b/src/support.h +index 0f1d737..3f804e0 100644 +--- a/src/support.h ++++ b/src/support.h +@@ -160,10 +160,12 @@ static inline void gtk_combo_box_text_remove (GtkWidget *combo_box, gint positio + + #if GTK_CHECK_VERSION(3,0,0) + #define GTK_COMPAT_ADJUSTMENT_TYPE GtkAdjustment * ++#define GTK_COMPAT_DESTROY_TYPE GtkWidget * + #undef GTK_COMPAT_SWITCH_PAGE_TYPE + #define GTK_COMPAT_SWITCH_PAGE_TYPE GtkWidget * + #else + #define GTK_COMPAT_ADJUSTMENT_TYPE GtkObject * ++#define GTK_COMPAT_DESTROY_TYPE GtkObject * + #endif + + #endif diff --git a/system/xarchiver/xarchiver.SlackBuild b/system/xarchiver/xarchiver.SlackBuild index 149d72610a..658fff0d66 100644 --- a/system/xarchiver/xarchiver.SlackBuild +++ b/system/xarchiver/xarchiver.SlackBuild @@ -24,13 +24,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=xarchiver -VERSION=${VERSION:-0.5.4.8} +VERSION=${VERSION:-0.5.4.11} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -41,8 +41,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -70,12 +70,19 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Add GTK_COMPAT_DESTROY_TYPE +# There is a difference in the parameter types of the +# "destroy" callback function between GTK+ 2 and GTK+ 3. +# This fixes github issue #27, reported by apoleon. +patch -p1 < $CWD/gtk_fix.diff + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ + --mandir=/usr/man \ --localstatedir=/var \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --enable-debug=no \ @@ -84,6 +91,9 @@ CXXFLAGS="$SLKCFLAGS" \ make make install-strip DESTDIR=$PKG +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done + cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild cd $PKG/usr/doc ; ln -s xarchiver-$VERSION xarchiver ; cd - diff --git a/system/xarchiver/xarchiver.info b/system/xarchiver/xarchiver.info index def6ce7a6b..8b26818a8e 100644 --- a/system/xarchiver/xarchiver.info +++ b/system/xarchiver/xarchiver.info @@ -1,8 +1,8 @@ PRGNAM="xarchiver" -VERSION="0.5.4.8" +VERSION="0.5.4.11" HOMEPAGE="https://github.com/ib/xarchiver" -DOWNLOAD="https://github.com/ib/xarchiver/archive/0.5.4.8/xarchiver-0.5.4.8.tar.gz" -MD5SUM="58bf30410cda017aa32adce4a6dace2a" +DOWNLOAD="https://github.com/ib/xarchiver/archive/0.5.4.11/xarchiver-0.5.4.11.tar.gz" +MD5SUM="ddf269b3426004ef2e511247925b4e46" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |