9:34 p.m.
Author: raveit65
Update of /cvs/nonfree/rpms/caja-dropbox/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25364/devel
Modified Files:
.cvsignore sources
Added Files:
caja-dropbox.spec
caja-dropbox_fix_autoconf-automake_deprecations.patch
caja-dropbox_nautilus_to_caja.patch
Log Message:
--- NEW FILE caja-dropbox.spec ---
Summary: Dropbox extension for caja
Name: caja-dropbox
Version: 1.6.0
Release: 3%{?dist}
License: GPLv3+ and CC-BY-ND
Group: User Interface/Desktops
URL: https://linux.dropbox.com
Source0: https://linux.dropbox.com/packages/nautilus-dropbox-%{version}.tar.bz2
Patch0: caja-dropbox_fix_autoconf-automake_deprecations.patch
Patch1: caja-dropbox_nautilus_to_caja.patch
BuildRequires: mate-file-manager-devel
BuildRequires: python-docutils
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
# Run a fake X session
BuildRequires: xorg-x11-server-Xvfb
BuildRequires: xorg-x11-xauth
BuildRequires: zlib-devel
Requires: mate-file-manager-extensions
Requires: pygtk2
Requires: hicolor-icon-theme
%description
Dropbox extension for caja file manager
Dropbox allows you to sync your files online and across
your computers automatically.
%prep
%setup -q -n nautilus-dropbox-%{version}
%patch0 -p1 -b .deprecations
%patch1 -p1 -b .caja
autoreconf -i -f
%build
export CFLAGS="%{optflags}"
export CXXFLAGS="%{optflags}"
# xvfb-run is needed to find pygtk2
xvfb-run -a ./configure
xvfb-run -a make %{?_smp_mflags}
%install
make install DESTDIR=$RPM_BUILD_ROOT
find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
find ${RPM_BUILD_ROOT} -type f -name "*.a" -exec rm -f {} ';'
%check
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/dropbox.desktop
%post
/sbin/ldconfig
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
/sbin/ldconfig
if [ $1 -eq 0 ] ; then
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
%posttrans
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files
%doc AUTHORS COPYING NEWS README
%{_bindir}/dropbox
%{_datadir}/caja-dropbox/
%{_datadir}/icons/hicolor/*
%{_mandir}/man1/dropbox.1.gz
%{_datadir}/applications/dropbox.desktop
%{_libdir}/caja/extensions-2.0/libcaja-dropbox.so
%changelog
* Sat Jul 20 2013 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 1.6.0-3
- add exports
* Thu May 16 2013 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 1.6.0-2
- use a fake X session to find pygtk2 BR, fix build server issue
- fix autoconf/automake deprecations
* Sun May 12 2013 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 1.6.0-1
- add require hicolor-icon-theme
- remove useless libmatenotify BR
- clean up BR's
- switch to current upstream source
- fix licence information
* Thu Mar 21 2013 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 0.7.1-2
- initial build for fedora
* Fri Nov 16 2012 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 0.7.1-1
- build against official fedora mate-desktop
- remove epoch
- test remove libmate require
- clean BR
- add rpm scriptlets
- improve spec file
* Mon Aug 27 2012 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 0.7.1-0100
- build for f18
* Thu Jul 05 2012 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 0.7.1-4
- switch to Mate-Desktop source
* Thu Feb 23 2012 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 0.7.1-3
- fixed build error for i686
* Mon Feb 13 2012 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 0.7.1-2
- rebuild for enable builds for .i686
* Thu Jan 19 2012 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 0.7.1-1
- start building for caja
caja-dropbox_fix_autoconf-automake_deprecations.patch:
configure.ac | 132 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
configure.in | 132 --------------------------------------------------------
src/Makefile.am | 2
3 files changed, 133 insertions(+), 133 deletions(-)
--- NEW FILE caja-dropbox_fix_autoconf-automake_deprecations.patch ---
diff -uprN nautilus-dropbox-1.6.0-orig/configure.ac nautilus-dropbox-1.6.0/configure.ac
--- nautilus-dropbox-1.6.0-orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
+++ nautilus-dropbox-1.6.0/configure.ac 2013-05-16 14:12:22.924974252 +0200
@@ -0,0 +1,132 @@
+# Initialization
+
+AC_INIT([nautilus-dropbox],1.6.0)
+
+AM_INIT_AUTOMAKE
+
+AC_PREFIX_DEFAULT(/usr)
+
+AC_CONFIG_HEADERS([config.h])
+
+# not ready for i18n yet
+#AC_PROG_INTLTOOL([0.29])
+
+# Dependency checks
+NAUTILUS_REQUIRED=2.16.0
+GLIB_REQUIRED=2.14.0
+
+# Used programs
+AC_PROG_CC
+AM_PROG_LIBTOOL
+
+# Check for pkg-config
+AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, yes, no)
+AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+if test "x$HAVE_PKGCONFIG" = "xno"; then
+ AC_MSG_ERROR(you need to have pkgconfig installed !)
+fi
+
+PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension >= $NAUTILUS_REQUIRED)
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
+
+AC_PATH_PROG([PYTHON], [python])
+
+AC_PATH_PROG([RST2MAN], [rst2man], [python rst2man.py])
+AC_SUBST(RST2MAN)
+
+# define module checking macro
+AC_DEFUN([PYTHON_CHECK_MODULE], [
+AC_MSG_CHECKING([for $1])
+
+cat <<EOF | python
+try:
+ import $2
+except:
+ exit(1)
+else:
+ exit(0)
+EOF
+
+if test $? -ne 0; then
+ AC_MSG_RESULT([no])
+ AC_MSG_ERROR([couldn't find $1])
+else
+ AC_MSG_RESULT([yes])
+fi
+])
+
+PYTHON_CHECK_MODULE(pygtk, gtk)
+PYTHON_CHECK_MODULE(gobject, gobject)
+PYTHON_CHECK_MODULE(docutils, docutils)
+
+# Make dependency CFLAGS and LIBS available
+AC_SUBST(NAUTILUS_CFLAGS)
+AC_SUBST(NAUTILUS_LIBS)
+AC_SUBST(GLIB_CFLAGS)
+AC_SUBST(GLIB_LIBS)
+
+# lol stolen from the automake manual
+AC_ARG_ENABLE([debug],
+[ --enable-debug Turn on debugging],
+[case "${enableval}" in
+yes) debug=true ;;
+no) debug=false ;;
+*) AC_MSG_ERROR([bad value ${enableval} for --enable-debug]) ;;
+esac],[debug=false])
+AM_CONDITIONAL([DEBUG], [test x$debug = xtrue])
+
+AC_ARG_WITH(nautilus-extension-dir,
+ [AS_HELP_STRING([--with-nautilus-extension-dir],
+ [specify the nautilus extension directory])])
+
+# Get nautilus extensions directory
+AC_MSG_CHECKING([for nautilus extension directory])
+if test -n "$with_nautilus_extension_dir"; then
+ NAUTILUS_EXTENSION_DIR=$with_nautilus_extension_dir
+else
+ NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension`
+fi
+if test -z "$NAUTILUS_EXTENSION_DIR"; then
+ NAUTILUS_EXTENSION_DIR='${exec_prefix}/lib/nautilus/extension-1.0'
+fi
+
+AC_MSG_RESULT([${NAUTILUS_EXTENSION_DIR}])
+AC_SUBST(NAUTILUS_EXTENSION_DIR)
+
+NAUTILUS_VERSION=`$PKG_CONFIG --modversion libnautilus-extension`
+if test -n "$NAUTILUS_VERSION"; then
+ NAUTILUS_VERSION_MAJOR=`echo -n $NAUTILUS_VERSION | cut -d . -f 1`
+ NAUTILUS_VERSION_MINOR=`echo -n $NAUTILUS_VERSION | cut -d . -f 2`
+ NAUTILUS_VERSION_MICRO=`echo -n $NAUTILUS_VERSION | cut -d . -f 3`
+fi
+
+AC_DEFINE_UNQUOTED(NAUTILUS_VERSION_MAJOR, [$NAUTILUS_VERSION_MAJOR], [ nautilus version
major])
+AC_DEFINE_UNQUOTED(NAUTILUS_VERSION_MINOR, [$NAUTILUS_VERSION_MINOR], [ nautilus version
minor])
+AC_DEFINE_UNQUOTED(NAUTILUS_VERSION_MICRO, [$NAUTILUS_VERSION_MICRO], [ nautilus version
micro])
+
+EMBLEM_DIR='${datadir}/nautilus-dropbox/emblems'
+AC_SUBST(EMBLEM_DIR)
+
+AC_CONFIG_FILES([
+ Makefile
+ src/Makefile
+ data/Makefile
+ data/icons/Makefile
+ data/icons/hicolor/Makefile
+ data/icons/hicolor/16x16/Makefile
+ data/icons/hicolor/16x16/apps/Makefile
+ data/icons/hicolor/22x22/Makefile
+ data/icons/hicolor/22x22/apps/Makefile
+ data/icons/hicolor/24x24/Makefile
+ data/icons/hicolor/24x24/apps/Makefile
+ data/icons/hicolor/32x32/Makefile
+ data/icons/hicolor/32x32/apps/Makefile
+ data/icons/hicolor/48x48/Makefile
+ data/icons/hicolor/48x48/apps/Makefile
+ data/icons/hicolor/64x64/Makefile
+ data/icons/hicolor/64x64/apps/Makefile
+ data/icons/hicolor/256x256/Makefile
+ data/icons/hicolor/256x256/apps/Makefile
+ data/emblems/Makefile])
+
+AC_OUTPUT
diff -uprN nautilus-dropbox-1.6.0-orig/configure.in nautilus-dropbox-1.6.0/configure.in
--- nautilus-dropbox-1.6.0-orig/configure.in 2013-01-23 23:20:59.000000000 +0100
+++ nautilus-dropbox-1.6.0/configure.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,132 +0,0 @@
-# Initialization
-
-AC_INIT([nautilus-dropbox],1.6.0)
-
-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
-
-AC_PREFIX_DEFAULT(/usr)
-
-AM_CONFIG_HEADER(config.h)
-
-# not ready for i18n yet
-#AC_PROG_INTLTOOL([0.29])
-
-# Dependency checks
-NAUTILUS_REQUIRED=2.16.0
-GLIB_REQUIRED=2.14.0
-
-# Used programs
-AC_PROG_CC
-AM_PROG_LIBTOOL
-
-# Check for pkg-config
-AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, yes, no)
-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-if test "x$HAVE_PKGCONFIG" = "xno"; then
- AC_MSG_ERROR(you need to have pkgconfig installed !)
-fi
-
-PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension >= $NAUTILUS_REQUIRED)
-PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
-
-AC_PATH_PROG([PYTHON], [python])
-
-AC_PATH_PROG([RST2MAN], [rst2man], [python rst2man.py])
-AC_SUBST(RST2MAN)
-
-# define module checking macro
-AC_DEFUN([PYTHON_CHECK_MODULE], [
-AC_MSG_CHECKING([for $1])
-
-cat <<EOF | python
-try:
- import $2
-except:
- exit(1)
-else:
- exit(0)
-EOF
-
-if test $? -ne 0; then
- AC_MSG_RESULT([no])
- AC_MSG_ERROR([couldn't find $1])
-else
- AC_MSG_RESULT([yes])
-fi
-])
-
-PYTHON_CHECK_MODULE(pygtk, gtk)
-PYTHON_CHECK_MODULE(gobject, gobject)
-PYTHON_CHECK_MODULE(docutils, docutils)
-
-# Make dependency CFLAGS and LIBS available
-AC_SUBST(NAUTILUS_CFLAGS)
-AC_SUBST(NAUTILUS_LIBS)
-AC_SUBST(GLIB_CFLAGS)
-AC_SUBST(GLIB_LIBS)
-
-# lol stolen from the automake manual
-AC_ARG_ENABLE([debug],
-[ --enable-debug Turn on debugging],
-[case "${enableval}" in
-yes) debug=true ;;
-no) debug=false ;;
-*) AC_MSG_ERROR([bad value ${enableval} for --enable-debug]) ;;
-esac],[debug=false])
-AM_CONDITIONAL([DEBUG], [test x$debug = xtrue])
-
-AC_ARG_WITH(nautilus-extension-dir,
- [AS_HELP_STRING([--with-nautilus-extension-dir],
- [specify the nautilus extension directory])])
-
-# Get nautilus extensions directory
-AC_MSG_CHECKING([for nautilus extension directory])
-if test -n "$with_nautilus_extension_dir"; then
- NAUTILUS_EXTENSION_DIR=$with_nautilus_extension_dir
-else
- NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension`
-fi
-if test -z "$NAUTILUS_EXTENSION_DIR"; then
- NAUTILUS_EXTENSION_DIR='${exec_prefix}/lib/nautilus/extension-1.0'
-fi
-
-AC_MSG_RESULT([${NAUTILUS_EXTENSION_DIR}])
-AC_SUBST(NAUTILUS_EXTENSION_DIR)
-
-NAUTILUS_VERSION=`$PKG_CONFIG --modversion libnautilus-extension`
-if test -n "$NAUTILUS_VERSION"; then
- NAUTILUS_VERSION_MAJOR=`echo -n $NAUTILUS_VERSION | cut -d . -f 1`
- NAUTILUS_VERSION_MINOR=`echo -n $NAUTILUS_VERSION | cut -d . -f 2`
- NAUTILUS_VERSION_MICRO=`echo -n $NAUTILUS_VERSION | cut -d . -f 3`
-fi
-
-AC_DEFINE_UNQUOTED(NAUTILUS_VERSION_MAJOR, [$NAUTILUS_VERSION_MAJOR], [ nautilus version
major])
-AC_DEFINE_UNQUOTED(NAUTILUS_VERSION_MINOR, [$NAUTILUS_VERSION_MINOR], [ nautilus version
minor])
-AC_DEFINE_UNQUOTED(NAUTILUS_VERSION_MICRO, [$NAUTILUS_VERSION_MICRO], [ nautilus version
micro])
-
-EMBLEM_DIR='${datadir}/nautilus-dropbox/emblems'
-AC_SUBST(EMBLEM_DIR)
-
-AC_CONFIG_FILES([
- Makefile
- src/Makefile
- data/Makefile
- data/icons/Makefile
- data/icons/hicolor/Makefile
- data/icons/hicolor/16x16/Makefile
- data/icons/hicolor/16x16/apps/Makefile
- data/icons/hicolor/22x22/Makefile
- data/icons/hicolor/22x22/apps/Makefile
- data/icons/hicolor/24x24/Makefile
- data/icons/hicolor/24x24/apps/Makefile
- data/icons/hicolor/32x32/Makefile
- data/icons/hicolor/32x32/apps/Makefile
- data/icons/hicolor/48x48/Makefile
- data/icons/hicolor/48x48/apps/Makefile
- data/icons/hicolor/64x64/Makefile
- data/icons/hicolor/64x64/apps/Makefile
- data/icons/hicolor/256x256/Makefile
- data/icons/hicolor/256x256/apps/Makefile
- data/emblems/Makefile])
-
-AC_OUTPUT
diff -uprN nautilus-dropbox-1.6.0-orig/src/Makefile.am
nautilus-dropbox-1.6.0/src/Makefile.am
--- nautilus-dropbox-1.6.0-orig/src/Makefile.am 2010-06-15 01:36:52.000000000 +0200
+++ nautilus-dropbox-1.6.0/src/Makefile.am 2013-05-16 13:52:41.359875041 +0200
@@ -1,4 +1,4 @@
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_builddir)
caja-dropbox_nautilus_to_caja.patch:
Makefile.in | 6
README | 12
config.h.in | 12
configure | 140 ++--
configure.ac | 54 -
data/Makefile.in | 6
data/emblems/Makefile.in | 6
data/icons/Makefile.in | 6
data/icons/hicolor/16x16/Makefile.in | 6
data/icons/hicolor/16x16/apps/Makefile.in | 6
data/icons/hicolor/22x22/Makefile.in | 6
data/icons/hicolor/22x22/apps/Makefile.in | 6
data/icons/hicolor/24x24/Makefile.in | 6
data/icons/hicolor/24x24/apps/Makefile.in | 6
data/icons/hicolor/256x256/Makefile.in | 6
data/icons/hicolor/256x256/apps/Makefile.in | 6
data/icons/hicolor/32x32/Makefile.in | 6
data/icons/hicolor/32x32/apps/Makefile.in | 6
data/icons/hicolor/48x48/Makefile.in | 6
data/icons/hicolor/48x48/apps/Makefile.in | 6
data/icons/hicolor/64x64/Makefile.in | 6
data/icons/hicolor/64x64/apps/Makefile.in | 6
data/icons/hicolor/Makefile.in | 6
dropbox.in | 8
src/Makefile.am | 26
src/Makefile.in | 174 ++---
src/async-io-coroutine.h | 8
src/caja-dropbox-hooks.c | 337 +++++++++
src/caja-dropbox-hooks.h | 79 ++
src/caja-dropbox.c | 960 ++++++++++++++++++++++++++++
src/caja-dropbox.h | 69 ++
src/dropbox-client-util.c | 8
src/dropbox-client-util.h | 8
src/dropbox-client.c | 24
src/dropbox-client.h | 12
src/dropbox-command-client.c | 28
src/dropbox-command-client.h | 28
src/dropbox.c | 28
src/g-util.h | 8
src/nautilus-dropbox-hooks.c | 337 ---------
src/nautilus-dropbox-hooks.h | 79 --
src/nautilus-dropbox.c | 960 ----------------------------
src/nautilus-dropbox.h | 69 --
43 files changed, 1791 insertions(+), 1791 deletions(-)
--- NEW FILE caja-dropbox_nautilus_to_caja.patch ---
diff -uprN nautilus-dropbox-1.6.0-orig/config.h.in nautilus-dropbox-1.6.0/config.h.in
--- nautilus-dropbox-1.6.0-orig/config.h.in 2013-01-31 22:28:21.000000000 +0100
+++ nautilus-dropbox-1.6.0/config.h.in 2013-05-11 23:24:28.235980718 +0200
@@ -34,14 +34,14 @@
*/
#undef LT_OBJDIR
-/* nautilus version major */
-#undef NAUTILUS_VERSION_MAJOR
+/* caja version major */
+#undef CAJA_VERSION_MAJOR
-/* nautilus version micro */
-#undef NAUTILUS_VERSION_MICRO
+/* caja version micro */
+#undef CAJA_VERSION_MICRO
-/* nautilus version minor */
-#undef NAUTILUS_VERSION_MINOR
+/* caja version minor */
+#undef CAJA_VERSION_MINOR
/* Name of package */
#undef PACKAGE
diff -uprN nautilus-dropbox-1.6.0-orig/configure nautilus-dropbox-1.6.0/configure
--- nautilus-dropbox-1.6.0-orig/configure 2013-01-31 22:28:21.000000000 +0100
+++ nautilus-dropbox-1.6.0/configure 2013-05-12 00:24:54.059414771 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.64 for nautilus-dropbox 1.6.0.
+# Generated by GNU Autoconf 2.64 for caja-dropbox 1.6.0.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
@@ -693,10 +693,10 @@ MFLAGS=
MAKEFLAGS=
# Identity of this package.
-PACKAGE_NAME='nautilus-dropbox'
-PACKAGE_TARNAME='nautilus-dropbox'
+PACKAGE_NAME='caja-dropbox'
+PACKAGE_TARNAME='caja-dropbox'
PACKAGE_VERSION='1.6.0'
-PACKAGE_STRING='nautilus-dropbox 1.6.0'
+PACKAGE_STRING='caja-dropbox 1.6.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -742,15 +742,15 @@ am__EXEEXT_TRUE
LTLIBOBJS
LIBOBJS
EMBLEM_DIR
-NAUTILUS_EXTENSION_DIR
+CAJA_EXTENSION_DIR
DEBUG_FALSE
DEBUG_TRUE
RST2MAN
PYTHON
GLIB_LIBS
GLIB_CFLAGS
-NAUTILUS_LIBS
-NAUTILUS_CFLAGS
+CAJA_LIBS
+CAJA_CFLAGS
PKG_CONFIG
HAVE_PKGCONFIG
CPP
@@ -869,7 +869,7 @@ enable_fast_install
with_gnu_ld
enable_libtool_lock
enable_debug
-with_nautilus_extension_dir
+with_caja_extension_dir
'
ac_precious_vars='build_alias
host_alias
@@ -881,8 +881,8 @@ LIBS
CPPFLAGS
CPP
PKG_CONFIG
-NAUTILUS_CFLAGS
-NAUTILUS_LIBS
+CAJA_CFLAGS
+CAJA_LIBS
GLIB_CFLAGS
GLIB_LIBS'
@@ -1426,7 +1426,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures nautilus-dropbox 1.6.0 to adapt to many kinds of systems.
+\`configure' configures caja-dropbox 1.6.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1475,7 +1475,7 @@ Fine tuning of the installation director
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
--mandir=DIR man documentation [DATAROOTDIR/man]
--docdir=DIR documentation root
- [DATAROOTDIR/doc/nautilus-dropbox]
+ [DATAROOTDIR/doc/caja-dropbox]
--htmldir=DIR html documentation [DOCDIR]
--dvidir=DIR dvi documentation [DOCDIR]
--pdfdir=DIR pdf documentation [DOCDIR]
@@ -1497,7 +1497,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of nautilus-dropbox 1.6.0:";;
+ short | recursive ) echo "Configuration of caja-dropbox 1.6.0:";;
esac
cat <<\_ACEOF
@@ -1520,8 +1520,8 @@ Optional Packages:
--with-pic try to use only PIC/non-PIC objects [default=use
both]
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
- --with-nautilus-extension-dir
- specify the nautilus extension directory
+ --with-caja-extension-dir
+ specify the caja extension directory
Some influential environment variables:
CC C compiler command
@@ -1533,10 +1533,10 @@ Some influential environment variables:
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
PKG_CONFIG path to pkg-config utility
- NAUTILUS_CFLAGS
- C compiler flags for NAUTILUS, overriding pkg-config
- NAUTILUS_LIBS
- linker flags for NAUTILUS, overriding pkg-config
+ CAJA_CFLAGS
+ C compiler flags for CAJA, overriding pkg-config
+ CAJA_LIBS
+ linker flags for CAJA, overriding pkg-config
GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config
GLIB_LIBS linker flags for GLIB, overriding pkg-config
@@ -1606,7 +1606,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-nautilus-dropbox configure 1.6.0
+caja-dropbox configure 1.6.0
generated by GNU Autoconf 2.64
Copyright (C) 2009 Free Software Foundation, Inc.
@@ -1884,7 +1884,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by nautilus-dropbox $as_me 1.6.0, which was
+It was created by caja-dropbox $as_me 1.6.0, which was
generated by GNU Autoconf 2.64. Invocation command line was
$ $0 $@
@@ -2692,7 +2692,7 @@ fi
# Define the identity of the package.
- PACKAGE=nautilus-dropbox
+ PACKAGE=caja-dropbox
VERSION=1.6.0
@@ -2743,7 +2743,7 @@ ac_config_headers="$ac_config_headers co
#AC_PROG_INTLTOOL([0.29])
# Dependency checks
-NAUTILUS_REQUIRED=2.16.0
+CAJA_REQUIRED=1.2.0
GLIB_REQUIRED=2.14.0
# Used programs
@@ -10529,20 +10529,20 @@ $as_echo "no" >&6; }
fi
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NAUTILUS" >&5
-$as_echo_n "checking for NAUTILUS... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CAJA" >&5
+$as_echo_n "checking for CAJA... " >&6; }
if test -n "$PKG_CONFIG"; then
- if test -n "$NAUTILUS_CFLAGS"; then
- pkg_cv_NAUTILUS_CFLAGS="$NAUTILUS_CFLAGS"
+ if test -n "$CAJA_CFLAGS"; then
+ pkg_cv_CAJA_CFLAGS="$CAJA_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors
\"libnautilus-extension >= \$NAUTILUS_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libnautilus-extension >=
$NAUTILUS_REQUIRED") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors
\"libcaja-extension >= \$CAJA_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libcaja-extension >=
$CAJA_REQUIRED") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
[...4238 lines suppressed...]
-
- /*debug("create channel"); */
-
- /* Set non-blocking ;) (again just in case) */
- {
- GIOFlags flags;
- GIOStatus iostat;
-
- flags = g_io_channel_get_flags(hookserv->chan);
- iostat = g_io_channel_set_flags(hookserv->chan, flags | G_IO_FLAG_NONBLOCK,
- NULL);
- if (iostat == G_IO_STATUS_ERROR) {
- g_io_channel_unref(hookserv->chan);
- g_timeout_add_seconds(1, (GSourceFunc) try_to_connect, hookserv);
- return FALSE;
- }
- }
-
- /*debug("set non blocking"); */
-
- /* this is fun, async io watcher */
- hookserv->hhsi.line = 0;
- hookserv->hhsi.command_args = NULL;
- hookserv->hhsi.command_name = NULL;
- hookserv->event_source =
- g_io_add_watch_full(hookserv->chan, G_PRIORITY_DEFAULT,
- G_IO_IN | G_IO_PRI | G_IO_ERR | G_IO_HUP | G_IO_NVAL,
- (GIOFunc) handle_hook_server_input, hookserv,
- (GDestroyNotify) watch_killer);
-
- debug("hook client connected");
- hookserv->connected = TRUE;
- g_hook_list_invoke(&(hookserv->onconnect_hooklist), FALSE);
-
- /*debug("added watch");*/
- return FALSE;
-}
-
-/* should only be called in glib main loop */
-/* returns a gboolean because it is a GSourceFunc */
-gboolean nautilus_dropbox_hooks_force_reconnect(NautilusDropboxHookserv *hookserv) {
- debug_enter();
-
- if (hookserv->connected == FALSE) {
- return FALSE;
- }
-
- debug("forcing hook to reconnect");
-
- g_assert(hookserv->event_source >= 0);
-
- if (hookserv->event_source > 0) {
- g_source_remove(hookserv->event_source);
- }
- else if (hookserv->event_source == 0) {
- debug("event source was zero!!!!!");
- }
-
- return FALSE;
-}
-
-gboolean
-nautilus_dropbox_hooks_is_connected(NautilusDropboxHookserv *hookserv) {
- return hookserv->connected;
-}
-
-void
-nautilus_dropbox_hooks_setup(NautilusDropboxHookserv *hookserv) {
- hookserv->dispatch_table = g_hash_table_new_full((GHashFunc) g_str_hash,
- (GEqualFunc) g_str_equal,
- g_free, g_free);
- hookserv->connected = FALSE;
-
- g_hook_list_init(&(hookserv->ondisconnect_hooklist), sizeof(GHook));
- g_hook_list_init(&(hookserv->onconnect_hooklist), sizeof(GHook));
-}
-
-void
-nautilus_dropbox_hooks_add_on_disconnect_hook(NautilusDropboxHookserv *hookserv,
- DropboxHookClientConnectHook dhcch,
- gpointer ud) {
- GHook *newhook;
-
- newhook = g_hook_alloc(&(hookserv->ondisconnect_hooklist));
- newhook->func = dhcch;
- newhook->data = ud;
-
- g_hook_append(&(hookserv->ondisconnect_hooklist), newhook);
-}
-
-void
-nautilus_dropbox_hooks_add_on_connect_hook(NautilusDropboxHookserv *hookserv,
- DropboxHookClientConnectHook dhcch,
- gpointer ud) {
- GHook *newhook;
-
- newhook = g_hook_alloc(&(hookserv->onconnect_hooklist));
- newhook->func = dhcch;
- newhook->data = ud;
-
- g_hook_append(&(hookserv->onconnect_hooklist), newhook);
-}
-
-void nautilus_dropbox_hooks_add(NautilusDropboxHookserv *ndhs,
- const gchar *hook_name,
- DropboxUpdateHook hook, gpointer ud) {
- HookData *hd;
- hd = g_new(HookData, 1);
- hd->hook = hook;
- hd->ud = ud;
- g_hash_table_insert(ndhs->dispatch_table, g_strdup(hook_name), hd);
-}
-
-void
-nautilus_dropbox_hooks_start(NautilusDropboxHookserv *hookserv) {
- try_to_connect(hookserv);
-}
diff -uprN nautilus-dropbox-1.6.0-orig/src/nautilus-dropbox-hooks.h
nautilus-dropbox-1.6.0/src/nautilus-dropbox-hooks.h
--- nautilus-dropbox-1.6.0-orig/src/nautilus-dropbox-hooks.h 2010-04-09 01:21:32.000000000
+0200
+++ nautilus-dropbox-1.6.0/src/nautilus-dropbox-hooks.h 1970-01-01 01:00:00.000000000
+0100
@@ -1,79 +0,0 @@
-/*
- * Copyright 2008 Evenflow, Inc.
- *
- * nautilus-dropbox-hooks.h
- * Header file for nautilus-dropbox-hooks.c
- *
- * This file is part of nautilus-dropbox.
- *
- * nautilus-dropbox 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.
- *
- * nautilus-dropbox 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 nautilus-dropbox. If not, see <http://www.gnu.org/licenses/>;.
- *
- */
-
-#ifndef NAUTILUS_DROPBOX_HOOKS_H
-#define NAUTILUS_DROPBOX_HOOKS_H
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-typedef void (*DropboxUpdateHook)(GHashTable *, gpointer);
-typedef void (*DropboxHookClientConnectHook)(gpointer);
-
-typedef struct {
- GIOChannel *chan;
- int socket;
- struct {
- int line;
- gchar *command_name;
- GHashTable *command_args;
- int numargs;
- } hhsi;
- gboolean connected;
- guint event_source;
- GHashTable *dispatch_table;
- GHookList ondisconnect_hooklist;
- GHookList onconnect_hooklist;
-} NautilusDropboxHookserv;
-
-void
-nautilus_dropbox_hooks_setup(NautilusDropboxHookserv *);
-
-void
-nautilus_dropbox_hooks_start(NautilusDropboxHookserv *);
-
-gboolean
-nautilus_dropbox_hooks_is_connected(NautilusDropboxHookserv *);
-
-gboolean
-nautilus_dropbox_hooks_force_reconnect(NautilusDropboxHookserv *);
-
-void
-nautilus_dropbox_hooks_add(NautilusDropboxHookserv *ndhs,
- const gchar *hook_name,
- DropboxUpdateHook hook, gpointer ud);
-void
-nautilus_dropbox_hooks_add_on_disconnect_hook(NautilusDropboxHookserv *hookserv,
- DropboxHookClientConnectHook dhcch,
- gpointer ud);
-
-void
-nautilus_dropbox_hooks_add_on_connect_hook(NautilusDropboxHookserv *hookserv,
- DropboxHookClientConnectHook dhcch,
- gpointer ud);
-
-
-G_END_DECLS
-
-#endif
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/caja-dropbox/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 20 Jul 2013 20:16:40 -0000 1.1
+++ .cvsignore 20 Jul 2013 21:34:10 -0000 1.2
@@ -0,0 +1 @@
+nautilus-dropbox-1.6.0.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/caja-dropbox/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 20 Jul 2013 20:16:40 -0000 1.1
+++ sources 20 Jul 2013 21:34:11 -0000 1.2
@@ -0,0 +1 @@
+ab4ca49eb24498d14edad2c29aac530b nautilus-dropbox-1.6.0.tar.bz2