Hello community, here is the log from the commit of package parcellite for openSUSE:Factory checked in at 2013-09-12 18:09:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/parcellite (Old) and /work/SRC/openSUSE:Factory/.parcellite.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "parcellite" Changes: -------- --- /work/SRC/openSUSE:Factory/parcellite/parcellite.changes 2012-12-21 10:31:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.parcellite.new/parcellite.changes 2013-09-12 18:09:35.000000000 +0200 @@ -1,0 +2,24 @@ +Wed Sep 11 07:16:50 UTC 2013 - i...@marguerite.su + +- update version 1.1.6 + * Fixed Bug #99, Broken CLI functionality. Now looks at XDG_SESSION_COOKIE, + XDG_SEAT, and DISPLAY, introduced by multi-user fix. + * Fixed bug where if fifo are not found in client mode, parcellite segfaults. + * Apply patch for typo in German translation, patch #30. + * Updated parcellite.pot (cd po && make update-po). + * Changed name of history file from hist.test to history (debug escape). + To restore the history, Quit Parcellite, then cd to $HOME/.local/share/parcellite + mv hist.test history + * Added script to generate parcellite.pot & check in file, and gets run before + each release from rel.sh. + * Updated Brazilian Portuguese translation. +- removed patch: parcellite-0.9.1-german.diff, upstream fixed. +- removed patch: parcellite-0.9.1-defaults.patch, upstream code change, not usable. +- added patch: parcellite-1.1.6-defaults.patch, the new default tweaks from the old patch +- removed patch: parcellite-0.9.1-lxde-autostart.patch, upstream fixed. +- removed patch: parcellite-0.9.2-fix-glib-includes.patch, upstream fixed. +- removed patch: parcellite-1.0.2rc5-rpmlint_happy.patch. +- added patch: parcellite-1.0.2rc5-rpmlint_happy.patch +- added patch: parcellite-1.1.6-gio-missing-link.patch + +------------------------------------------------------------------- Old: ---- parcellite-0.9.1-defaults.diff parcellite-0.9.1-german.diff parcellite-0.9.1-lxde-autostart.patch parcellite-0.9.2-fix-glib-includes.patch parcellite-1.0.2rc5-rpmlint_happy.patch parcellite-1.0.2rc5.tar.gz New: ---- parcellite-1.1.6-defaults.patch parcellite-1.1.6-gio-missing-link.patch parcellite-1.1.6-rpmlint-errors.patch parcellite-1.1.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ parcellite.spec ++++++ --- /var/tmp/diff_new_pack.5uXmOC/_old 2013-09-12 18:09:35.000000000 +0200 +++ /var/tmp/diff_new_pack.5uXmOC/_new 2013-09-12 18:09:35.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package parcellite # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,25 +17,25 @@ Name: parcellite -Version: 1.0.2rc5 +Version: 1.1.6 Release: 0 Summary: A lightweight GTK+ clipboard manager License: GPL-3.0+ Group: Productivity/Other Url: http://parcellite.sourceforge.net/ -Source0: %{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Patch0: parcellite-0.9.1-german.diff -Patch1: parcellite-0.9.1-lxde-autostart.patch -Patch2: parcellite-0.9.1-defaults.diff -# PATCH-FIX-UPSTREAM parcellite-0.9.2-fix-glib-includes.patch g...@opensuse.org -- Do not include glib/gtypes.h directly -Patch4: parcellite-0.9.2-fix-glib-includes.patch -Patch5: parcellite-1.0.2rc5-rpmlint_happy.patch +Source: %{name}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM marguer...@opensuse.org -- tweak default settings. +Patch: parcellite-1.1.6-defaults.patch +# PATCH-FIX-UPSTREAM marguer...@opensuse.org -- fix rpmlint errors. +Patch1: parcellite-1.1.6-rpmlint-errors.patch +# PATCH-FIX-UPSTREAM marguer...@opensuse.org -- add missing -lgio-2.0 link +Patch2: parcellite-1.1.6-gio-missing-link.patch BuildRequires: automake BuildRequires: gnome-icon-theme -BuildRequires: gtk2-devel >= 2.10.0 BuildRequires: intltool >= 0.23 BuildRequires: update-desktop-files +BuildRequires: pkgconfig(gtk+-2.0) >= 2.10.0 +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Parcellite is a stripped down, basic-features-only clipboard manager with a @@ -45,35 +45,28 @@ other desktops or window managers you should also install a panel with a system tray or notification area if you want to use this package. - %prep %setup -q -%patch0 -p1 +%patch -p1 %patch1 -p1 %patch2 -p1 -%patch4 -p1 -%patch5 -p1 %build autoreconf -fi %configure -make %{?_smp_mflags} %{?jobs:-j%jobs} +make %{?_smp_mflags} sed -i -e '/^Icon/s/=.*/=parcellite/' data/parcellite.desktop %install -make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' -mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps -%define iconname edit-paste +%make_install +mkdir -p %{buildroot}%{_datadir}/pixmaps install -m 644 \ - /usr/share/icons/gnome/32x32/actions/%{iconname}.png \ - $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png + /usr/share/icons/gnome/32x32/actions/edit-paste.png \ + %{buildroot}%{_datadir}/pixmaps/%{name}.png %find_lang %{name} %suse_update_desktop_file -r -G "Clipboard Manager" %{name} GTK GNOME Utility DesktopUtility %suse_update_desktop_file -r -G "Clipboard Manager" %{name}-startup GTK GNOME Utility DesktopUtility TrayIcon -%clean -rm -rf $RPM_BUILD_ROOT - %post %desktop_database_post ++++++ parcellite-1.1.6-defaults.patch ++++++ Index: parcellite-1.1.6/src/preferences.c =================================================================== --- parcellite-1.1.6.orig/src/preferences.c +++ parcellite-1.1.6/src/preferences.c @@ -24,7 +24,7 @@ #define INIT_MENU_KEY NULL #define DEF_USE_COPY TRUE -#define DEF_USE_PRIMARY FALSE +#define DEF_USE_PRIMARY TRUE #define DEF_SYNCHRONIZE FALSE #define DEF_SAVE_HISTORY TRUE #define DEF_HISTORY_LIMIT 25 @@ -35,10 +35,10 @@ #define DEF_ITEM_LENGTH 50 #define DEF_ITEM_LENGTH_MAX 200 #define DEF_ELLIPSIZE 2 -#define DEF_PHISTORY_KEY "<Ctrl><Alt>X" -#define DEF_HISTORY_KEY "<Ctrl><Alt>H" -#define DEF_ACTIONS_KEY "<Ctrl><Alt>A" -#define DEF_MENU_KEY "<Ctrl><Alt>P" +#define DEF_PHISTORY_KEY "" +#define DEF_HISTORY_KEY "" +#define DEF_ACTIONS_KEY "" +#define DEF_MENU_KEY "" #define DEF_NO_ICON FALSE /**allow lower nibble to become the number of items of this type */ ++++++ parcellite-1.1.6-gio-missing-link.patch ++++++ Index: parcellite-1.1.6/src/Makefile.am =================================================================== --- parcellite-1.1.6.orig/src/Makefile.am +++ parcellite-1.1.6/src/Makefile.am @@ -1,6 +1,6 @@ AM_CFLAGS = -I$(top_srcdir) -DPARCELLITELOCALEDIR=\""$(parcellitelocaledir)"\" INCLUDES = $(GTK_CFLAGS) $(APPINDICATOR_CFLAGS) -LDADD = $(GTK_LIBS) $(APPINDICATOR_LIBS) -lX11 -lgdk-x11-2.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 +LDADD = $(GTK_LIBS) $(APPINDICATOR_LIBS) -lX11 -lgdk-x11-2.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lgio-2.0 bin_PROGRAMS = parcellite ++++++ parcellite-1.1.6-rpmlint-errors.patch ++++++ Index: parcellite-1.1.6/src/history.c =================================================================== --- parcellite-1.1.6.orig/src/history.c +++ parcellite-1.1.6/src/history.c @@ -503,6 +503,7 @@ int save_history_as_text(gchar *path) } g_printf("histpath='%s'\n",path); + return 0; } /***************************************************************************/ /** Dialog to save the history file. Index: parcellite-1.1.6/src/main.c =================================================================== --- parcellite-1.1.6.orig/src/main.c +++ parcellite-1.1.6/src/main.c @@ -63,6 +63,9 @@ g_signal_connect(clipboard, "owner-chang #endif #include "parcellite.h" +#include <stdlib.h> +#include <ctype.h> +#include <glib-2.0/glib.h> /**ACT are actions, and MODE is the mode of the action */ /** #define ACT_STOP 0 @@ -613,6 +616,7 @@ static void *execute_action(void *comman g_free((gchar*)command); /* Exit this thread */ pthread_exit(NULL); + return 0; } /* Called when execution action exits */ @@ -769,6 +773,7 @@ gboolean history_item_right_click_on_edi struct history_info *h=(struct history_info*)data; h->wi.tmp1|=EDIT_MODE_USE_RIGHT_CLICK; edit_selected((GtkMenuItem *)menuitem, data); + return 1; } /***************************************************************************/ @@ -1922,6 +1927,7 @@ static void show_parcellite_menu(GtkSta gboolean show_parcellite_menu_wrapper(gpointer data) { create_parcellite_menu(0, gtk_get_current_event_time()); + return 1; } /***************************************************************************/ Index: parcellite-1.1.6/src/preferences.c =================================================================== --- parcellite-1.1.6.orig/src/preferences.c +++ parcellite-1.1.6/src/preferences.c @@ -221,6 +221,7 @@ int init_pref( void ) dummy[0].tip="Dummy tip"; dummy[1].name=NULL; dummy[1].sec=PREF_SEC_NONE; + return 0; } /***************************************************************************/ /** set the wideget of item. @@ -233,6 +234,7 @@ int set_pref_widget (char *name, GtkWidg if(NULL == p) return -1; p->w=w; + return 0; } /***************************************************************************/ /** get the char * value of string. @@ -286,6 +288,7 @@ int set_pref_string (char *name, char *s if(p->cval != NULL) g_free(p->cval); p->cval=g_strdup(string); + return 0; } /***************************************************************************/ Index: parcellite-1.1.6/src/utils.c =================================================================== --- parcellite-1.1.6.orig/src/utils.c +++ parcellite-1.1.6/src/utils.c @@ -26,6 +26,7 @@ #include <fcntl.h> #include <errno.h> #include <libgen.h> +#include <stdlib.h> /**set this to debug looking up user environment vars to see other instances of parcellite */ /**#define DEBUG_MULTI */ ++++++ parcellite-1.0.2rc5.tar.gz -> parcellite-1.1.6.tar.gz ++++++ ++++ 43379 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
