From 5f3c0231efd40af6fd96341860c3344aec4a6d6e Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sun, 21 Oct 2007 01:15:41 +0000 Subject: [PATCH 1/5] Initialize branch F-8 for xfce-mcs-plugins --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..e9e7ccd --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-8 From bd86a6b307c159c53a5ac7bc03293f09462b26ef Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 7 Dec 2007 03:36:37 +0000 Subject: [PATCH 2/5] Update to 4.4.2 --- .cvsignore | 2 +- sources | 2 +- xfce-mcs-plugins-4.4.2-fedora.patch | 14 ++++++++++++++ xfce-mcs-plugins.spec | 15 ++++++++------- 4 files changed, 24 insertions(+), 9 deletions(-) create mode 100644 xfce-mcs-plugins-4.4.2-fedora.patch diff --git a/.cvsignore b/.cvsignore index 59947cf..f49e1c6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xfce-mcs-plugins-4.4.1.tar.bz2 +xfce-mcs-plugins-4.4.2.tar.bz2 diff --git a/sources b/sources index 986c5b7..232146e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -99f05b5ce95f24c205731565210aa8a9 xfce-mcs-plugins-4.4.1.tar.bz2 +77fcc929058de530d4f91eb25de851a1 xfce-mcs-plugins-4.4.2.tar.bz2 diff --git a/xfce-mcs-plugins-4.4.2-fedora.patch b/xfce-mcs-plugins-4.4.2-fedora.patch new file mode 100644 index 0000000..bcde2a9 --- /dev/null +++ b/xfce-mcs-plugins-4.4.2-fedora.patch @@ -0,0 +1,14 @@ +--- xfce-mcs-plugins-4.4.2/plugins/ui_plugin/ui_plugin.c.orig 2007-12-01 20:56:27.000000000 +0100 ++++ xfce-mcs-plugins-4.4.2/plugins/ui_plugin/ui_plugin.c 2007-12-01 20:59:17.000000000 +0100 +@@ -131,9 +131,9 @@ + #define RCFILE "gtk.xml" + #define CHANNEL "settings" + #define PLUGIN_NAME "ui" +-#define DEFAULT_THEME "Default" ++#define DEFAULT_THEME "Clearlooks" + #define INITIAL_THEME "Xfce" +-#define DEFAULT_ICON_THEME "hicolor" ++#define DEFAULT_ICON_THEME "Fedora" + #define INITIAL_ICON_THEME "Rodent" + #define DEFAULT_TOOLBAR_STYLE "icons" + #define DEFAULT_FONT "Sans 9" diff --git a/xfce-mcs-plugins.spec b/xfce-mcs-plugins.spec index 8694557..e0a6477 100644 --- a/xfce-mcs-plugins.spec +++ b/xfce-mcs-plugins.spec @@ -1,12 +1,11 @@ Summary: Plugins for multi channel settings manager Name: xfce-mcs-plugins -Version: 4.4.1 -Release: 3%{?dist} +Version: 4.4.2 +Release: 1%{?dist} License: GPLv2 URL: http://www.xfce.org/ -Source0: http://www.xfce.org/archive/xfce-4.4.1/src/xfce-mcs-plugins-4.4.1.tar.bz2 -Patch: xfce-mcs-plugins-4.2.0-rh.patch -Patch1: xfce-mcs-plugins-4.4.1-dpi.patch +Source0: http://www.xfce.org/archive/xfce-4.4.2/src/xfce-mcs-plugins-4.4.2.tar.bz2 +Patch: xfce-mcs-plugins-4.4.2-fedora.patch Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: xfce-mcs-manager >= %{version} @@ -25,8 +24,7 @@ settings manager. %prep %setup -q -%patch -p1 -b .fedora -%patch1 -p1 -b .dpi +%patch -p1 -b .theme %build %configure @@ -56,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/*/*/apps/* %changelog +* Sun Nov 18 2007 Kevin Fenzi - 4.4.2-1 +- Update to 4.4.2 + * Mon Aug 27 2007 Kevin Fenzi - 4.4.1-3 - Update License tag From 388acbb6b03c56533f886c8d0e1ce3a0390ed24a Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 19 Dec 2007 03:09:42 +0000 Subject: [PATCH 3/5] Add patch for mouse button crash (fixes #425925) --- xfce-mcs-plugins-4.4.2-mouse.patch | 29 +++++++++++++++++++++++++++++ xfce-mcs-plugins.spec | 7 ++++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 xfce-mcs-plugins-4.4.2-mouse.patch diff --git a/xfce-mcs-plugins-4.4.2-mouse.patch b/xfce-mcs-plugins-4.4.2-mouse.patch new file mode 100644 index 0000000..f994370 --- /dev/null +++ b/xfce-mcs-plugins-4.4.2-mouse.patch @@ -0,0 +1,29 @@ +diff -Nur xfce-mcs-plugins-4.4.2.orig/plugins/mouse_plugin/mouse_plugin.c xfce-mcs-plugins-4.4.2/plugins/mouse_plugin/mouse_plugin.c +--- xfce-mcs-plugins-4.4.2.orig/plugins/mouse_plugin/mouse_plugin.c 2007-11-17 12:31:23.000000000 -0700 ++++ xfce-mcs-plugins-4.4.2/plugins/mouse_plugin/mouse_plugin.c 2007-12-17 17:51:03.000000000 -0700 +@@ -174,7 +174,7 @@ + unsigned char *buttons; + gint n_buttons, n_devices, i; + gint idx_1 = 0, idx_3 = 1; +- gsize buttons_capacity = 16; ++ gsize buttons_capacity = DEFAULT_PTR_MAP_SIZE; + + device_info = XListInputDevices (GDK_DISPLAY (), &n_devices); + +@@ -204,11 +204,12 @@ + continue; + } + +- n_buttons = XGetDeviceButtonMapping (GDK_DISPLAY (), device, buttons, DEFAULT_PTR_MAP_SIZE); +- if (n_buttons > DEFAULT_PTR_MAP_SIZE) ++ n_buttons = XGetDeviceButtonMapping (GDK_DISPLAY (), device, buttons, buttons_capacity); ++ if (n_buttons > buttons_capacity) + { +- buttons = g_alloca (n_buttons); +- n_buttons = XGetDeviceButtonMapping (GDK_DISPLAY (), device, buttons, n_buttons); ++ buttons = g_realloc (buttons, n_buttons); ++ buttons_capacity = n_buttons; ++ n_buttons = XGetDeviceButtonMapping (GDK_DISPLAY (), device, buttons, buttons_capacity); + } + + for (i = 0; i < n_buttons; i++) diff --git a/xfce-mcs-plugins.spec b/xfce-mcs-plugins.spec index e0a6477..43feb04 100644 --- a/xfce-mcs-plugins.spec +++ b/xfce-mcs-plugins.spec @@ -1,11 +1,12 @@ Summary: Plugins for multi channel settings manager Name: xfce-mcs-plugins Version: 4.4.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 URL: http://www.xfce.org/ Source0: http://www.xfce.org/archive/xfce-4.4.2/src/xfce-mcs-plugins-4.4.2.tar.bz2 Patch: xfce-mcs-plugins-4.4.2-fedora.patch +Patch1: xfce-mcs-plugins-4.4.2-mouse.patch Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: xfce-mcs-manager >= %{version} @@ -25,6 +26,7 @@ settings manager. %prep %setup -q %patch -p1 -b .theme +%patch1 -p1 -b .mouse %build %configure @@ -54,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/*/*/apps/* %changelog +* Mon Dec 17 2007 Kevin Fenzi - 4.4.2-2 +- Add patch for mouse button crash (fixes #425925) + * Sun Nov 18 2007 Kevin Fenzi - 4.4.2-1 - Update to 4.4.2 From b6e3560ffc6b0209308f94218e0fd3d85da26dac Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:32:41 +0000 Subject: [PATCH 4/5] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7df561d..294af23 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := xfce-mcs-plugins SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From d0832fd66364c7305439a9616e0ea29b9264b7d5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:42:20 +0000 Subject: [PATCH 5/5] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 294af23..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xfce-mcs-plugins -# $Id$ -NAME := xfce-mcs-plugins -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index e9e7ccd..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-8