deja-dup 34.3 master
authorYaakov Selkowitz <yselkowi@redhat.com>
Thu, 2 Mar 2017 19:12:09 +0000 (13:12 -0600)
committerYaakov Selkowitz <yselkowi@redhat.com>
Thu, 2 Mar 2017 19:12:09 +0000 (13:12 -0600)
03-caja-extension.patch
05-packagekit.patch [new file with mode: 0644]
deja-dup.cygport

index 919cf2574a448705388c8a830c0daa48e8cca57a..c7041e9d27d664e820a6dfc4cd1eaa793b486b9c 100644 (file)
@@ -1,14 +1,15 @@
 --- origsrc/deja-dup-32.0/CMakeLists.txt       2014-09-20 10:04:47.000000000 -0500
 +++ src/deja-dup-32.0/CMakeLists.txt   2015-06-24 17:24:57.396380700 -0500
 --- origsrc/deja-dup-32.0/CMakeLists.txt       2014-09-20 10:04:47.000000000 -0500
 +++ src/deja-dup-32.0/CMakeLists.txt   2015-06-24 17:24:57.396380700 -0500
-@@ -25,6 +25,7 @@ include(DejaDupMacros)
+@@ -25,6 +25,8 @@ include(DejaDupMacros)
  
  deja_option(ENABLE_CCPANEL "Build gnome-control-center panel" CHECK)
  deja_option(ENABLE_NAUTILUS "Build nautilus plugin" CHECK)
 +deja_option(ENABLE_CAJA "Build caja plugin" CHECK)
  
  deja_option(ENABLE_CCPANEL "Build gnome-control-center panel" CHECK)
  deja_option(ENABLE_NAUTILUS "Build nautilus plugin" CHECK)
 +deja_option(ENABLE_CAJA "Build caja plugin" CHECK)
++deja_option(ENABLE_NEMO "Build nemo plugin" CHECK)
  deja_option(ENABLE_UNITY "Integrate with Unity" CHECK)
  deja_option(ENABLE_UNITY_CCPANEL "Build unity-control-center panel" CHECK)
  
  deja_option(ENABLE_UNITY "Integrate with Unity" CHECK)
  deja_option(ENABLE_UNITY_CCPANEL "Build unity-control-center panel" CHECK)
  
-@@ -53,6 +54,14 @@ if(ENABLE_NAUTILUS)
+@@ -53,6 +55,22 @@ if(ENABLE_NAUTILUS)
                    OUTPUT_STRIP_TRAILING_WHITESPACE
                    ERROR_QUIET)
  endif()
                    OUTPUT_STRIP_TRAILING_WHITESPACE
                    ERROR_QUIET)
  endif()
 +                  OUTPUT_VARIABLE CAJA_EXTENSIONDIR
 +                  OUTPUT_STRIP_TRAILING_WHITESPACE
 +                  ERROR_QUIET)
 +                  OUTPUT_VARIABLE CAJA_EXTENSIONDIR
 +                  OUTPUT_STRIP_TRAILING_WHITESPACE
 +                  ERROR_QUIET)
++endif()
++
++deja_enable_option(NEMO libnemo-extension)
++if(ENABLE_NEMO)
++  execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=extensiondir libnemo-extension
++                  OUTPUT_VARIABLE NEMO_EXTENSIONDIR
++                  OUTPUT_STRIP_TRAILING_WHITESPACE
++                  ERROR_QUIET)
 +endif()
  
  deja_enable_option(UNITY_CCPANEL libunity-control-center)
  if(ENABLE_UNITY_CCPANEL)
 --- origsrc/deja-dup-32.0/deja-dup/CMakeLists.txt      2014-05-02 11:47:15.000000000 -0500
 +++ src/deja-dup-32.0/deja-dup/CMakeLists.txt  2015-06-24 17:21:33.982746100 -0500
 +endif()
  
  deja_enable_option(UNITY_CCPANEL libunity-control-center)
  if(ENABLE_UNITY_CCPANEL)
 --- origsrc/deja-dup-32.0/deja-dup/CMakeLists.txt      2014-05-02 11:47:15.000000000 -0500
 +++ src/deja-dup-32.0/deja-dup/CMakeLists.txt  2015-06-24 17:21:33.982746100 -0500
-@@ -50,6 +50,7 @@ install(DIRECTORY ui DESTINATION "${PKG_
+@@ -50,6 +50,8 @@ install(DIRECTORY ui DESTINATION "${PKG_
  add_subdirectory(help)
  add_subdirectory(monitor)
  add_subdirectory(nautilus)
 +add_subdirectory(caja)
  add_subdirectory(help)
  add_subdirectory(monitor)
  add_subdirectory(nautilus)
 +add_subdirectory(caja)
++add_subdirectory(nemo)
  add_subdirectory(preferences)
  add_subdirectory(tests)
  add_subdirectory(widgets)
 --- origsrc/deja-dup-34.0/deja-dup/caja/CMakeLists.txt 1969-12-31 18:00:00.000000000 -0600
 +++ src/deja-dup-34.0/deja-dup/caja/CMakeLists.txt     2015-11-18 19:17:15.888685200 -0600
  add_subdirectory(preferences)
  add_subdirectory(tests)
  add_subdirectory(widgets)
 --- origsrc/deja-dup-34.0/deja-dup/caja/CMakeLists.txt 1969-12-31 18:00:00.000000000 -0600
 +++ src/deja-dup-34.0/deja-dup/caja/CMakeLists.txt     2015-11-18 19:17:15.888685200 -0600
-@@ -0,0 +1,12 @@
+@@ -0,0 +1,13 @@
 +if(ENABLE_CAJA)
 +add_library(caja-deja-dup MODULE CajaExtension.c)
 +target_link_libraries(caja-deja-dup ${GLIB_LDFLAGS} ${CAJA_LDFLAGS})
 +set_target_properties(caja-deja-dup PROPERTIES
 +                      INCLUDE_DIRECTORIES "${CMAKE_BINARY_DIR}/libdeja"
 +                      COMPILE_FLAGS "${GLIB_CFLAGS} ${CAJA_CFLAGS} ${COMMON_CFLAGS}")
 +if(ENABLE_CAJA)
 +add_library(caja-deja-dup MODULE CajaExtension.c)
 +target_link_libraries(caja-deja-dup ${GLIB_LDFLAGS} ${CAJA_LDFLAGS})
 +set_target_properties(caja-deja-dup PROPERTIES
 +                      INCLUDE_DIRECTORIES "${CMAKE_BINARY_DIR}/libdeja"
 +                      COMPILE_FLAGS "${GLIB_CFLAGS} ${CAJA_CFLAGS} ${COMMON_CFLAGS}")
++add_dependencies(caja-deja-dup deja) # needs DirHandling.c
 +install(TARGETS caja-deja-dup DESTINATION "${CAJA_EXTENSIONDIR}")
 +configure_file(libcaja-deja-dup.caja-extension.in
 +              libcaja-deja-dup.caja-extension @ONLY)
 +install(TARGETS caja-deja-dup DESTINATION "${CAJA_EXTENSIONDIR}")
 +configure_file(libcaja-deja-dup.caja-extension.in
 +              libcaja-deja-dup.caja-extension @ONLY)
 +Version=@VERSION@
 +Author=Michael Terry <mike@mterry.name>
 +Copyright=Copyright (C) 2004–2005 Free Software Foundation, Inc.\nCopyright (C) 2009–2011 Michael Terry <mike@mterry.name>
 +Version=@VERSION@
 +Author=Michael Terry <mike@mterry.name>
 +Copyright=Copyright (C) 2004–2005 Free Software Foundation, Inc.\nCopyright (C) 2009–2011 Michael Terry <mike@mterry.name>
+--- origsrc/deja-dup-34.0/deja-dup/nemo/CMakeLists.txt 1969-12-31 18:00:00.000000000 -0600
++++ src/deja-dup-34.0/deja-dup/nemo/CMakeLists.txt     2015-11-18 19:17:15.888685200 -0600
+@@ -0,0 +1,9 @@
++if(ENABLE_NEMO)
++add_library(nemo-deja-dup MODULE NemoExtension.c)
++target_link_libraries(nemo-deja-dup ${GLIB_LDFLAGS} ${NEMO_LDFLAGS})
++set_target_properties(nemo-deja-dup PROPERTIES
++                      INCLUDE_DIRECTORIES "${CMAKE_BINARY_DIR}/libdeja"
++                      COMPILE_FLAGS "${GLIB_CFLAGS} ${NEMO_CFLAGS} ${COMMON_CFLAGS}")
++add_dependencies(nemo-deja-dup deja) # needs DirHandling.c
++install(TARGETS nemo-deja-dup DESTINATION "${NEMO_EXTENSIONDIR}")
++endif()
diff --git a/05-packagekit.patch b/05-packagekit.patch
new file mode 100644 (file)
index 0000000..042c4ea
--- /dev/null
@@ -0,0 +1,53 @@
+--- origsrc/deja-dup-34.3/CMakeLists.txt       2017-03-02 12:26:26.776101800 -0600
++++ src/deja-dup-34.3/CMakeLists.txt   2017-03-02 12:27:32.449738500 -0600
+@@ -37,7 +37,7 @@ deja_check_modules(GLIB REQUIRED glib-2.
+ deja_check_modules(GTK REQUIRED gtk+-3.0>=3.6)
+ deja_check_modules(NOTIFY REQUIRED libnotify>=0.7)
+ deja_check_modules(PEAS REQUIRED libpeas-1.0)
+-deja_check_modules(PK REQUIRED packagekit-glib2)
++deja_check_modules(PK packagekit-glib2)
+ deja_check_modules(SECRET REQUIRED libsecret-1)
+ # This is obnoxious.
+--- origsrc/deja-dup-34.3/deja-dup/preferences/Preferences.vala        2015-11-29 07:58:23.000000000 -0600
++++ src/deja-dup-34.3/deja-dup/preferences/Preferences.vala    2017-03-02 12:41:19.269186300 -0600
+@@ -62,6 +62,7 @@ public class Preferences : Gtk.Grid
+     }
+   }
++#if HAVE_PK
+   async void install_duplicity()
+   {
+     backup_button.sensitive = false;
+@@ -119,6 +120,7 @@ public class Preferences : Gtk.Grid
+     backup_button.sensitive = true;
+     restore_button.sensitive = true;
+   }
++#endif
+   Gtk.Widget make_settings_page()
+   {
+@@ -201,9 +203,11 @@ public class Preferences : Gtk.Grid
+     (w as Gtk.Button).clicked.connect((b) => {
+       if (duplicity_installed) {
+         run_deja_dup("--restore", b.get_display().get_app_launch_context());
++#if HAVE_PK
+       } else {
+         restore_progress.visible = true;
+         install_duplicity.begin();
++#endif
+       }
+     });
+     restore_button = w as Gtk.Button;
+@@ -247,9 +251,11 @@ public class Preferences : Gtk.Grid
+     (w as Gtk.Button).clicked.connect((b) => {
+       if (duplicity_installed) {
+         run_deja_dup("--backup", b.get_display().get_app_launch_context());
++#if HAVE_PK
+       } else {
+         backup_progress.visible = true;
+         install_duplicity.begin();
++#endif
+       }
+     });
+     backup_button = w as Gtk.Button;
index f3211866740e040061b738e4f07d803cf9f6ab5d..b9382c3df54670b0eef271f7ad2ee3c508b8d70a 100644 (file)
@@ -1,7 +1,7 @@
 inherit cmake
 
 NAME="deja-dup"
 inherit cmake
 
 NAME="deja-dup"
-VERSION=34.0
+VERSION=34.3
 RELEASE=1
 CATEGORY="GNOME"
 SUMMARY="GNOME backup tool"
 RELEASE=1
 CATEGORY="GNOME"
 SUMMARY="GNOME backup tool"
@@ -14,6 +14,7 @@ PATCH_URI="01-cmake-install.patch
            02-plugin-loader.patch
            03-caja-extension.patch
            04-help2man-PATH.patch
            02-plugin-loader.patch
            03-caja-extension.patch
            04-help2man-PATH.patch
+           05-packagekit.patch
 "
 
 PKG_NAMES="deja-dup nautilus-deja-dup caja-deja-dup"
 "
 
 PKG_NAMES="deja-dup nautilus-deja-dup caja-deja-dup"
@@ -33,11 +34,13 @@ DIFF_EXCLUDES="*.c *.h *.stamp *.vapi"
 
 CYGPORT_USE_UNSTABLE_API=1
 src_patch_hook() {
 
 CYGPORT_USE_UNSTABLE_API=1
 src_patch_hook() {
-       inform "Creating Caja extension"
+       inform "Creating Caja/Nemo extensions"
        for f in NautilusExtension.c NautilusExtension.h
        do
                sed -e 's/NAUTILUS/CAJA/g;s/Nautilus/Caja/g;s/nautilus/caja/g' \
                        deja-dup/nautilus/$f > deja-dup/caja/${f/Nautilus/Caja}
        for f in NautilusExtension.c NautilusExtension.h
        do
                sed -e 's/NAUTILUS/CAJA/g;s/Nautilus/Caja/g;s/nautilus/caja/g' \
                        deja-dup/nautilus/$f > deja-dup/caja/${f/Nautilus/Caja}
+               sed -e 's/NAUTILUS/NEMO/g;s/Nautilus/Nemo/g;s/nautilus/nemo/g' \
+                       deja-dup/nautilus/$f > deja-dup/caja/${f/Nautilus/Nemo}
        done
 }
 
        done
 }
 
@@ -45,4 +48,5 @@ CYGCMAKE_ARGS="
        -DCMAKE_INSTALL_SYSCONFDIR=/etc
        -DENABLE_NAUTILUS=1
        -DENABLE_CAJA=1
        -DCMAKE_INSTALL_SYSCONFDIR=/etc
        -DENABLE_NAUTILUS=1
        -DENABLE_CAJA=1
+       -DENABLE_NEMO=0
 "
 "
This page took 0.034531 seconds and 5 git commands to generate.