deja-dup 32.0
authorYaakov Selkowitz <yselkowi@redhat.com>
Wed, 24 Jun 2015 22:55:45 +0000 (17:55 -0500)
committerYaakov Selkowitz <yselkowi@redhat.com>
Wed, 24 Jun 2015 22:55:45 +0000 (17:55 -0500)
01-cmake-install.patch [new file with mode: 0644]
01-no-undefined.patch [deleted file]
03-caja-extension.patch
04-help2man-PATH.patch [new file with mode: 0644]
deja-dup.cygport

diff --git a/01-cmake-install.patch b/01-cmake-install.patch
new file mode 100644 (file)
index 0000000..40363fe
--- /dev/null
@@ -0,0 +1,24 @@
+--- origsrc/deja-dup-32.0/deja-dup/widgets/CMakeLists.txt      2014-04-28 20:26:27.000000000 -0500
++++ src/deja-dup-32.0/deja-dup/widgets/CMakeLists.txt  2015-06-24 17:20:15.500257200 -0500
+@@ -55,6 +55,8 @@ vala_precompile(VALA_C ConfigBool.vala
+ add_library(widgets SHARED ${VALA_C})
+ target_link_libraries(widgets deja ${GTK_LDFLAGS} ${NOTIFY_LDFLAGS} ${PEAS_LDFLAGS} ${SECRET_LDFLAGS} ${UNITY_LDFLAGS})
+ set_target_properties(widgets PROPERTIES
++                      OUTPUT_NAME "deja-dup-widgets"
+                       INCLUDE_DIRECTORIES "${CMAKE_BINARY_DIR}/libdeja;${CMAKE_SOURCE_DIR}/libdeja"
+                       COMPILE_FLAGS "${GTK_CFLAGS} ${NOTIFY_CFLAGS} ${PEAS_CFLAGS} ${SECRET_CFLAGS} ${UNITY_CFLAGS} ${COMMON_CFLAGS}")
+-install(TARGETS widgets DESTINATION "${PKG_LIBDIR}")
++install(TARGETS widgets LIBRARY DESTINATION "${PKG_LIBDIR}"
++                        RUNTIME DESTINATION bin)
+--- origsrc/deja-dup-32.0/libdeja/CMakeLists.txt       2014-04-28 20:26:33.000000000 -0500
++++ src/deja-dup-32.0/libdeja/CMakeLists.txt   2015-06-24 17:20:55.201528000 -0500
+@@ -52,7 +52,8 @@ target_link_libraries(deja ${GLIB_LDFLAG
+ set_target_properties(deja PROPERTIES
+                       INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}"
+                       COMPILE_FLAGS "${GLIB_CFLAGS} ${PEAS_CFLAGS} ${SECRET_CFLAGS} ${COMMON_CFLAGS}")
+-install(TARGETS deja DESTINATION "${PKG_LIBDIR}")
++install(TARGETS deja LIBRARY DESTINATION "${PKG_LIBDIR}"
++                     RUNTIME DESTINATION bin)
+ add_subdirectory(tests)
+ add_subdirectory(tools)
diff --git a/01-no-undefined.patch b/01-no-undefined.patch
deleted file mode 100644 (file)
index 75f0708..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
---- origsrc/deja-dup-28.0/deja-dup/nautilus/Makefile.am        2013-09-10 00:37:00.000000000 -0500
-+++ src/deja-dup-28.0/deja-dup/nautilus/Makefile.am    2014-02-28 11:46:47.149261400 -0600
-@@ -30,6 +30,6 @@ libdeja_dup_la_CFLAGS = \
- libdeja_dup_la_SOURCES = \
-       NautilusExtension.c NautilusExtension.h
--libdeja_dup_la_LDFLAGS = -module -avoid-version
-+libdeja_dup_la_LDFLAGS = -module -avoid-version -no-undefined
- libdeja_dup_la_LIBADD = $(NAUTILUS_LIBS) @INTLLIBS@
- endif
---- origsrc/deja-dup-28.0/deja-dup/widgets/Makefile.am 2013-09-10 00:34:44.000000000 -0500
-+++ src/deja-dup-28.0/deja-dup/widgets/Makefile.am     2014-02-28 12:08:44.479608400 -0600
-@@ -25,7 +25,7 @@ libwidgets_la_CFLAGS = \
-       -w \
-       -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\"
--libwidgets_la_LDFLAGS = -avoid-version
-+libwidgets_la_LDFLAGS = -avoid-version -no-undefined -release $(PACKAGE)
- libwidgets_la_LIBADD = \
-       $(WIDGETS_LIBS) \
---- origsrc/deja-dup-28.0/libdeja/Makefile.am  2013-09-10 00:46:07.000000000 -0500
-+++ src/deja-dup-28.0/libdeja/Makefile.am      2014-02-28 11:46:08.290038800 -0600
-@@ -26,7 +26,7 @@ libdeja_la_CFLAGS = \
-       -DPKG_LIBEXEC_DIR=\"$(pkglibexecdir)\" \
-       -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\"
--libdeja_la_LDFLAGS = -avoid-version
-+libdeja_la_LDFLAGS = -avoid-version -no-undefined
- libdeja_la_LIBADD = \
-       $(LIBDEJA_LIBS) \
---- origsrc/deja-dup-28.0/libdeja/tools/duplicity/Makefile.am  2013-09-10 00:40:10.000000000 -0500
-+++ src/deja-dup-28.0/libdeja/tools/duplicity/Makefile.am      2014-02-28 11:50:14.649129700 -0600
-@@ -27,7 +27,7 @@ libduplicity_la_CFLAGS = \
-       -DPKG_LIBEXEC_DIR=\"$(pkglibexecdir)\" \
-       -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\"
--libduplicity_la_LDFLAGS = -module -avoid-version
-+libduplicity_la_LDFLAGS = -module -avoid-version -no-undefined
- libduplicity_la_LIBADD = \
-       $(LIBDEJA_LIBS) \
index ab0b92e4e9e5a6a18ced25930505b678d20ee045..dd86a44b23fe5df98900ec76492a3d239a15513e 100644 (file)
@@ -1,37 +1,72 @@
---- origsrc/deja-dup-24.0/configure.ac 2012-09-24 11:34:55.000000000 -0500
-+++ src/deja-dup-24.0/configure.ac     2012-12-23 05:29:15.652765500 -0600
-@@ -153,6 +153,28 @@ AS_IF([test "x$with_nautilus" != xno],
- )
- AM_CONDITIONAL([HAVE_NAUTILUS], [test -n "$NAUTILUS_LIBS"])
+--- 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)
  
-+AC_ARG_WITH([caja],
-+  [AS_HELP_STRING([--with-caja],
-+    [build caja plugin @<:@default=check@:>@])],
-+  [],
-+  [with_caja=check])
-+AS_IF([test "x$with_caja" != xno],
-+  [PKG_CHECK_MODULES(CAJA, libcaja-extension 
-+                           glib-2.0 >= $GLIB_REQ_VER,
-+    [dnl Get caja extensions directory
-+     AS_IF([test "x$with_extensiondir" != xno],
-+       [CAJA_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libcaja-extension`],
-+       [CAJA_EXTENSION_DIR="${PREFIX}/lib/caja/extensions-2.0"])
-+     AC_SUBST(CAJA_EXTENSION_DIR)],
-+    [if test "x$with_caja" != xcheck; then
-+        AC_MSG_FAILURE(
-+          [--with-caja was given, but test for libcaja-extension failed])
-+      fi
-+    ]
-+  )]
-+)
-+AM_CONDITIONAL([HAVE_CAJA], [test -n "$CAJA_LIBS"])
-+
- AH_TEMPLATE([HAVE_UNITY], [whether libunity is available])
- AC_ARG_WITH([unity],
-   [AS_HELP_STRING([--with-unity],
---- origsrc/deja-dup-28.0/deja-dup/nautilus/CajaExtension.c    1969-12-31 18:00:00.000000000 -0600
-+++ src/deja-dup-28.0/deja-dup/nautilus/CajaExtension.c        2012-12-23 05:31:42.182146500 -0600
-@@ -0,0 +1,339 @@
+ 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_UNITY "Integrate with Unity" CHECK)
+ deja_option(ENABLE_UNITY_CCPANEL "Build unity-control-center panel" CHECK)
+@@ -53,6 +54,14 @@ if(ENABLE_NAUTILUS)
+                   OUTPUT_STRIP_TRAILING_WHITESPACE
+                   ERROR_QUIET)
+ endif()
++
++deja_enable_option(CAJA libcaja-extension)
++if(ENABLE_CAJA)
++  execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=extensiondir libcaja-extension
++                  OUTPUT_VARIABLE CAJA_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
+@@ -50,6 +50,7 @@ install(DIRECTORY ui DESTINATION "${PKG_
+ add_subdirectory(help)
+ add_subdirectory(monitor)
+ add_subdirectory(nautilus)
++add_subdirectory(caja)
+ add_subdirectory(preferences)
+ add_subdirectory(tests)
+ add_subdirectory(widgets)
+--- origsrc/deja-dup-32.0/deja-dup/caja/CMakeLists.txt 1969-12-31 18:00:00.000000000 -0600
++++ src/deja-dup-32.0/deja-dup/caja/CMakeLists.txt     2015-06-24 17:22:24.174617000 -0500
+@@ -0,0 +1,28 @@
++# -*- Mode: CMake; indent-tabs-mode: nil; tab-width: 2 -*-
++#
++# This file is part of Déjà Dup.
++# For copyright information, see AUTHORS.
++#
++# Déjà Dup is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 3 of the License, or
++# (at your option) any later version.
++#
++# Déjà Dup is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with Déjà Dup.  If not, see <http://www.gnu.org/licenses/>.
++
++if(ENABLE_CAJA)
++add_library(deja-dup-caja MODULE CajaExtension.c)
++target_link_libraries(deja-dup-caja ${GLIB_LDFLAGS} ${CAJA_LDFLAGS})
++set_target_properties(deja-dup-caja PROPERTIES
++                      OUTPUT_NAME deja-dup
++                      INCLUDE_DIRECTORIES "${CMAKE_BINARY_DIR}/libdeja"
++                      COMPILE_FLAGS "${GLIB_CFLAGS} ${CAJA_CFLAGS} ${COMMON_CFLAGS}")
++add_dependencies(deja-dup-caja deja) # needs DirHandling.c
++install(TARGETS deja-dup-caja DESTINATION "${CAJA_EXTENSIONDIR}")
++endif()
+--- origsrc/deja-dup-32.0/deja-dup/caja/CajaExtension.c        1969-12-31 18:00:00.000000000 -0600
++++ src/deja-dup-32.0/deja-dup/caja/CajaExtension.c    2015-06-24 17:24:10.216682200 -0500
+@@ -0,0 +1,338 @@
 +/* -*- Mode: C; indent-tabs-mode: nil; tab-width: 2 -*- */
 +/*
 +    This file is part of Déjà Dup.
@@ -55,7 +90,6 @@
 +#include "DirHandling.c"
 +
 +#include "CajaExtension.h"
-+#include "config.h"
 +#include <libcaja-extension/caja-menu-provider.h>
 +#include <glib/gi18n-lib.h>
 +
 +  update_include_excludes(); /* will clear it now that settings is NULL */
 +}
 +
---- origsrc/deja-dup-28.0/deja-dup/nautilus/CajaExtension.h    1969-12-31 18:00:00.000000000 -0600
-+++ src/deja-dup-28.0/deja-dup/nautilus/CajaExtension.h        2012-12-23 05:27:02.320139300 -0600
+--- origsrc/deja-dup-32.0/deja-dup/caja/CajaExtension.h        1969-12-31 18:00:00.000000000 -0600
++++ src/deja-dup-32.0/deja-dup/caja/CajaExtension.h    2015-06-24 17:23:13.952464100 -0500
 @@ -0,0 +1,57 @@
 +/* -*- Mode: C; indent-tabs-mode: nil; tab-width: 2 -*- */
 +/*
 +G_END_DECLS
 +
 +#endif
---- origsrc/deja-dup-28.0/deja-dup/nautilus/Makefile.am        2012-12-23 05:14:17.228378500 -0600
-+++ src/deja-dup-28.0/deja-dup/nautilus/Makefile.am    2012-12-23 05:31:07.837182000 -0600
-@@ -33,3 +33,20 @@ libdeja_dup_la_SOURCES = \
- libdeja_dup_la_LDFLAGS = -module -avoid-version -no-undefined
- libdeja_dup_la_LIBADD = $(NAUTILUS_LIBS) @INTLLIBS@
- endif
-+
-+if HAVE_CAJA
-+cajadir = $(CAJA_EXTENSION_DIR)
-+caja_LTLIBRARIES = libcaja-deja-dup.la
-+
-+libcaja_deja_dup_la_CFLAGS = \
-+      -I$(top_srcdir)/libdeja \
-+      $(CAJA_CFLAGS) \
-+      -DPKG_LIBEXEC_DIR=\"$(pkglibexecdir)\" \
-+      -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\"
-+
-+libcaja_deja_dup_la_SOURCES = \
-+      CajaExtension.c CajaExtension.h
-+
-+libcaja_deja_dup_la_LDFLAGS = -module -avoid-version -no-undefined
-+libcaja_deja_dup_la_LIBADD = $(CAJA_LIBS) @INTLLIBS@
-+endif
diff --git a/04-help2man-PATH.patch b/04-help2man-PATH.patch
new file mode 100644 (file)
index 0000000..07a6253
--- /dev/null
@@ -0,0 +1,24 @@
+--- origsrc/deja-dup-32.0/man/CMakeLists.txt   2013-09-30 21:06:59.000000000 -0500
++++ src/deja-dup-32.0/man/CMakeLists.txt       2015-06-24 17:39:32.978461200 -0500
+@@ -21,8 +21,8 @@ string(REPLACE ".po" "" LINGUAS "${POFIL
+ add_custom_command(OUTPUT C/deja-dup.1 C/deja-dup-preferences.1
+                    COMMAND mkdir -p C
+-                   COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/help2man -N -i ${CMAKE_CURRENT_SOURCE_DIR}/include.main -L en_US.UTF-8 ${CMAKE_BINARY_DIR}/deja-dup/deja-dup -o C/deja-dup.1
+-                   COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/help2man -N -i ${CMAKE_CURRENT_SOURCE_DIR}/include.pref -L en_US.UTF-8 ${CMAKE_BINARY_DIR}/deja-dup/preferences/deja-dup-preferences -o C/deja-dup-preferences.1
++                   COMMAND env "PATH=${CMAKE_BINARY_DIR}/deja-dup/widgets:${CMAKE_BINARY_DIR}/libdeja:$ENV{PATH}" ${CMAKE_CURRENT_SOURCE_DIR}/help2man -N -i ${CMAKE_CURRENT_SOURCE_DIR}/include.main -L en_US.UTF-8 ${CMAKE_BINARY_DIR}/deja-dup/deja-dup -o C/deja-dup.1
++                   COMMAND env "PATH=${CMAKE_BINARY_DIR}/deja-dup/widgets:${CMAKE_BINARY_DIR}/libdeja:$ENV{PATH}" ${CMAKE_CURRENT_SOURCE_DIR}/help2man -N -i ${CMAKE_CURRENT_SOURCE_DIR}/include.pref -L en_US.UTF-8 ${CMAKE_BINARY_DIR}/deja-dup/preferences/deja-dup-preferences -o C/deja-dup-preferences.1
+                    DEPENDS deja-dup deja-dup-preferences)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/C/deja-dup.1 ${CMAKE_CURRENT_BINARY_DIR}/C/deja-dup-preferences.1 DESTINATION "${CMAKE_INSTALL_FULL_DATADIR}/man/man1")
+ list(APPEND MAN_TARGETS C/deja-dup.1 C/deja-dup-preferences.1)
+@@ -31,8 +31,8 @@ foreach(LINGUA ${LINGUAS})
+   add_custom_command(OUTPUT ${LINGUA}/deja-dup.1 ${LINGUA}/deja-dup-preferences.1
+                      COMMAND mkdir -p ${LINGUA} locales/${LINGUA}/LC_MESSAGES
+                      COMMAND ln -sf ${CMAKE_BINARY_DIR}/po/${LINGUA}.gmo locales/${LINGUA}/LC_MESSAGES/deja-dup.mo
+-                     COMMAND env DEJA_DUP_LOCALEDIR=${CMAKE_CURRENT_BINARY_DIR}/locales DEJA_DUP_LANGUAGE=${LINGUA} ${CMAKE_CURRENT_SOURCE_DIR}/help2man -N -i ${CMAKE_CURRENT_SOURCE_DIR}/include.main -L en_US.UTF-8 ${CMAKE_BINARY_DIR}/deja-dup/deja-dup -o ${LINGUA}/deja-dup.1
+-                     COMMAND env DEJA_DUP_LOCALEDIR=${CMAKE_CURRENT_BINARY_DIR}/locales DEJA_DUP_LANGUAGE=${LINGUA} ${CMAKE_CURRENT_SOURCE_DIR}/help2man -N -i ${CMAKE_CURRENT_SOURCE_DIR}/include.main -L en_US.UTF-8 ${CMAKE_BINARY_DIR}/deja-dup/preferences/deja-dup-preferences -o ${LINGUA}/deja-dup-preferences.1
++                     COMMAND env "PATH=${CMAKE_BINARY_DIR}/deja-dup/widgets:${CMAKE_BINARY_DIR}/libdeja:$ENV{PATH}" DEJA_DUP_LOCALEDIR=${CMAKE_CURRENT_BINARY_DIR}/locales DEJA_DUP_LANGUAGE=${LINGUA} ${CMAKE_CURRENT_SOURCE_DIR}/help2man -N -i ${CMAKE_CURRENT_SOURCE_DIR}/include.main -L en_US.UTF-8 ${CMAKE_BINARY_DIR}/deja-dup/deja-dup -o ${LINGUA}/deja-dup.1
++                     COMMAND env "PATH=${CMAKE_BINARY_DIR}/deja-dup/widgets:${CMAKE_BINARY_DIR}/libdeja:$ENV{PATH}" DEJA_DUP_LOCALEDIR=${CMAKE_CURRENT_BINARY_DIR}/locales DEJA_DUP_LANGUAGE=${LINGUA} ${CMAKE_CURRENT_SOURCE_DIR}/help2man -N -i ${CMAKE_CURRENT_SOURCE_DIR}/include.main -L en_US.UTF-8 ${CMAKE_BINARY_DIR}/deja-dup/preferences/deja-dup-preferences -o ${LINGUA}/deja-dup-preferences.1
+                      DEPENDS translations deja-dup deja-dup-preferences)
+   install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LINGUA}/deja-dup.1 ${CMAKE_CURRENT_BINARY_DIR}/${LINGUA}/deja-dup-preferences.1 DESTINATION "${CMAKE_INSTALL_FULL_DATADIR}/man/${LINGUA}/man1")
index 28dfbb390373b915f883699c11b99ee6c2310481..14355bb6a457f5019a2b0dc90280814a8813b995 100644 (file)
@@ -1,8 +1,8 @@
-inherit gnome2
+inherit cmake
 
 NAME="deja-dup"
-VERSION=28.0
-RELEASE=2
+VERSION=32.0
+RELEASE=1
 CATEGORY="GNOME"
 SUMMARY="GNOME backup tool"
 DESCRIPTION="Deja Dup is a simple backup tool. It hides the complexity
@@ -10,9 +10,10 @@ of backing up the Right Way (encrypted, off-site, and regular) and uses
 duplicity as the backend."
 HOMEPAGE="https://launchpad.net/deja-dup/"
 SRC_URI="https://launchpad.net/deja-dup/${VERSION%%.*}/${VERSION}/+download/${NAME}-${VERSION}.tar.xz"
-PATCH_URI="01-no-undefined.patch
+PATCH_URI="01-cmake-install.patch
            02-plugin-loader.patch
            03-caja-extension.patch
+           04-help2man-PATH.patch
 "
 
 PKG_NAMES="deja-dup nautilus-deja-dup caja-deja-dup"
@@ -26,10 +27,12 @@ caja_deja_dup_SUMMARY="Caja Deja-Dup backup plugin"
 caja_deja_dup_OBSOLETES="mate-file-manager-deja-dup"
 caja_deja_dup_REQUIRES=${NAME}
 caja_deja_dup_CONTENTS="usr/lib/caja/"
-PKG_IGNORE="usr/lib/deja-dup/*.dll.a"  # private libs
 
 # generated by valac
 DIFF_EXCLUDES="*.c *.h *.stamp *.vapi"
 
-CYGCONF_ARGS="--with-nautilus --with-caja"
-
+CYGCMAKE_ARGS="
+       -DCMAKE_INSTALL_SYSCONFDIR=/etc
+       -DENABLE_NAUTILUS=1
+       -DENABLE_CAJA=1
+"
This page took 0.030447 seconds and 5 git commands to generate.