diff options
| -rw-r--r-- | system/xarchiver/gtk_fix.diff | 30 | ||||
| -rw-r--r-- | system/xarchiver/xarchiver.SlackBuild | 8 | ||||
| -rw-r--r-- | system/xarchiver/xarchiver.info | 6 |
3 files changed, 4 insertions, 40 deletions
diff --git a/system/xarchiver/gtk_fix.diff b/system/xarchiver/gtk_fix.diff deleted file mode 100644 index 7adedfe3479a3..0000000000000 --- a/system/xarchiver/gtk_fix.diff +++ /dev/null @@ -1,30 +0,0 @@ -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 658fff0d66719..3bcddd4862f28 100644 --- a/system/xarchiver/xarchiver.SlackBuild +++ b/system/xarchiver/xarchiver.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=xarchiver -VERSION=${VERSION:-0.5.4.11} +VERSION=${VERSION:-0.5.4.13} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -70,12 +70,6 @@ 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 \ diff --git a/system/xarchiver/xarchiver.info b/system/xarchiver/xarchiver.info index 8b26818a8ebcb..ada0ae9c36543 100644 --- a/system/xarchiver/xarchiver.info +++ b/system/xarchiver/xarchiver.info @@ -1,8 +1,8 @@ PRGNAM="xarchiver" -VERSION="0.5.4.11" +VERSION="0.5.4.13" HOMEPAGE="https://github.com/ib/xarchiver" -DOWNLOAD="https://github.com/ib/xarchiver/archive/0.5.4.11/xarchiver-0.5.4.11.tar.gz" -MD5SUM="ddf269b3426004ef2e511247925b4e46" +DOWNLOAD="https://github.com/ib/xarchiver/archive/0.5.4.13/xarchiver-0.5.4.13.tar.gz" +MD5SUM="e4cb50fbd5311d1a67cfdc946904a32a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |