commit cecb83391c95d8446017725fe13f62bd6f8c7525 Author: raveit65 <mate(a)raveit.de&gt; Date: Sun Apr 7 19:59:11 2019 +0200 update patches ...disable-creation-of-dropbox-script-binary.patch | 22 ----------- ...0001-show-full-path-of-caja-extension-dir.patch | 29 ++++++++++++++ ...TENSION_DIR_SYS-to-save-and-show-system-c.patch | 44 ++++++++++++++++++++++ caja-dropbox_fix-pygtk-in-configure.patch | 18 --------- use_python2.patch | 38 ------------------- 5 files changed, 73 insertions(+), 78 deletions(-) --- diff --git a/caja-dropbox_0001-show-full-path-of-caja-extension-dir.patch b/caja-dropbox_0001-show-full-path-of-caja-extension-dir.patch new file mode 100644 index 0000000..b11ae3b --- /dev/null +++ b/caja-dropbox_0001-show-full-path-of-caja-extension-dir.patch @@ -0,0 +1,29 @@ +From 3b7c67c9cc68317a7066ab33165d93ffdeb8e8d1 Mon Sep 17 00:00:00 2001 +From: Wu Xiaotian <yetist(a)gmail.com&gt; +Date: Tue, 19 Feb 2019 17:04:25 +0800 +Subject: [PATCH 1/2] show full path of caja-extension-dir + +--- + configure.ac | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index bf52831..5f061f7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -91,7 +91,11 @@ if test -z "$CAJA_EXTENSION_DIR"; then + custom_caja_extension_dir=false + fi + +-AC_MSG_RESULT([${CAJA_EXTENSION_DIR}]) ++if test x$custom_caja_extension_dir = xtrue; then ++ AC_MSG_RESULT([${CAJA_EXTENSION_DIR}]) ++else ++ AC_MSG_RESULT([${libdir}/${CAJA_EXTENSION_DIR}]) ++fi + AM_CONDITIONAL([CUSTOM_CAJA_EXTENSION_DIR], [test x$custom_caja_extension_dir = xtrue]) + AC_SUBST(CAJA_EXTENSION_DIR) + +-- +2.21.0 + diff --git a/caja-dropbox_0002-Use-CAJA_EXTENSION_DIR_SYS-to-save-and-show-system-c.patch b/caja-dropbox_0002-Use-CAJA_EXTENSION_DIR_SYS-to-save-and-show-system-c.patch new file mode 100644 index 0000000..1f1108a --- /dev/null +++ b/caja-dropbox_0002-Use-CAJA_EXTENSION_DIR_SYS-to-save-and-show-system-c.patch @@ -0,0 +1,44 @@ +From a12424a913d137f377f9d5401999bdd6c7fbd8e1 Mon Sep 17 00:00:00 2001 +From: Wu Xiaotian <yetist(a)gmail.com&gt; +Date: Thu, 28 Feb 2019 10:46:53 +0800 +Subject: [PATCH 2/2] Use CAJA_EXTENSION_DIR_SYS to save and show system caja + extension dir + +Here just show message, so a new variable used to save and show. +Remove fallback caja_extension_dir set, pkg check libcaja-extension +before, so this is not needed. +--- + configure.ac | 10 +++------- + 1 file changed, 3 insertions(+), 7 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 5f061f7..7b63336 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -81,20 +81,16 @@ if test -n "$with_caja_extension_dir"; then + CAJA_EXTENSION_DIR=$with_caja_extension_dir + custom_caja_extension_dir=true + else +- CAJA_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libcaja-extension` +- CAJA_EXTENSION_DIR=${CAJA_EXTENSION_DIR#`$PKG_CONFIG --variable=libdir libcaja-extension`} ++ CAJA_EXTENSION_DIR_SYS=`$PKG_CONFIG --variable=extensiondir libcaja-extension` ++ CAJA_EXTENSION_DIR=${CAJA_EXTENSION_DIR_SYS#`$PKG_CONFIG --variable=libdir libcaja-extension`} + CAJA_EXTENSION_DIR=${CAJA_EXTENSION_DIR#/} + custom_caja_extension_dir=false + fi +-if test -z "$CAJA_EXTENSION_DIR"; then +- CAJA_EXTENSION_DIR='caja/extensions-2.0' +- custom_caja_extension_dir=false +-fi + + if test x$custom_caja_extension_dir = xtrue; then + AC_MSG_RESULT([${CAJA_EXTENSION_DIR}]) + else +- AC_MSG_RESULT([${libdir}/${CAJA_EXTENSION_DIR}]) ++ AC_MSG_RESULT([${CAJA_EXTENSION_DIR_SYS}]) + fi + AM_CONDITIONAL([CUSTOM_CAJA_EXTENSION_DIR], [test x$custom_caja_extension_dir = xtrue]) + AC_SUBST(CAJA_EXTENSION_DIR) +-- +2.21.0 +