From 036ec5b212caba619d57022a371a58c82c7aa5c2 Mon Sep 17 00:00:00 2001 From: Denis Leroy Date: Fri, 29 Aug 2008 12:34:33 +0000 Subject: [PATCH 01/11] Unfuzzed patches --- wp_tray-0.5.3-gnomewp.patch | 7 ++++--- wp_tray-0.5.3-missingdir.patch | 6 +++--- wp_tray.spec | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/wp_tray-0.5.3-gnomewp.patch b/wp_tray-0.5.3-gnomewp.patch index b0089e6..f04292d 100644 --- a/wp_tray-0.5.3-gnomewp.patch +++ b/wp_tray-0.5.3-gnomewp.patch @@ -1,6 +1,7 @@ ---- wp_tray-0.5.3/src/PreferencesDialog.cc~ 2006-11-15 01:43:23.000000000 +0100 -+++ wp_tray-0.5.3/src/PreferencesDialog.cc 2007-05-09 23:52:17.000000000 +0200 -@@ -47,6 +47,7 @@ +--- wp_tray-0.5.3.orig/src/PreferencesDialog.cc 2006-11-15 01:43:23.000000000 +0100 ++++ wp_tray-0.5.3/src/PreferencesDialog.cc 2008-08-29 14:26:51.000000000 +0200 +@@ -46,7 +46,8 @@ + m_pCheckButtonTimeout(NULL), m_pCheckButtonLogonNew(NULL), m_pCheckButtonImageCheck(NULL), - m_pCheckButtonFollowLinks(NULL) diff --git a/wp_tray-0.5.3-missingdir.patch b/wp_tray-0.5.3-missingdir.patch index 0763b39..8cf6318 100644 --- a/wp_tray-0.5.3-missingdir.patch +++ b/wp_tray-0.5.3-missingdir.patch @@ -1,5 +1,5 @@ ---- wp_tray-0.5.3/src/Wallpapers.cc.orig 2007-12-13 22:11:27.000000000 +0100 -+++ wp_tray-0.5.3/src/Wallpapers.cc 2007-12-13 22:10:41.000000000 +0100 +--- wp_tray-0.5.3.orig/src/Wallpapers.cc 2008-08-29 14:31:43.000000000 +0200 ++++ wp_tray-0.5.3/src/Wallpapers.cc 2008-08-29 14:31:49.000000000 +0200 @@ -294,6 +294,7 @@ { fs::directory_iterator itEnd; @@ -34,4 +34,4 @@ + } }// end Wallpapers::GetDirectoryEntryAtIndex - //------------------------------------------------------------------------ + //------------------------------------------------------------------------ diff --git a/wp_tray.spec b/wp_tray.spec index c0fd54c..145efd1 100644 --- a/wp_tray.spec +++ b/wp_tray.spec @@ -1,6 +1,6 @@ Name: wp_tray Version: 0.5.3 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A wallpaper-changing applet for GNOME Group: Amusements/Graphics From 9e0c08a1bbb286a80107319f85df8266ab410c53 Mon Sep 17 00:00:00 2001 From: Denis Leroy Date: Wed, 1 Oct 2008 22:19:31 +0000 Subject: [PATCH 02/11] Fixed boost patch --- wp_tray-0.5.3-boost.patch | 59 ++++++++++++++++++++++++++++------ wp_tray-0.5.3-missingdir.patch | 2 +- wp_tray.spec | 3 ++ 3 files changed, 54 insertions(+), 10 deletions(-) diff --git a/wp_tray-0.5.3-boost.patch b/wp_tray-0.5.3-boost.patch index 4667cf0..db14db6 100644 --- a/wp_tray-0.5.3-boost.patch +++ b/wp_tray-0.5.3-boost.patch @@ -1,19 +1,52 @@ -diff -ru wp_tray-0.5.3.orig/src/SearchDialog.cc wp_tray-0.5.3/src/SearchDialog.cc ---- wp_tray-0.5.3.orig/src/SearchDialog.cc 2007-08-21 15:18:43.000000000 +0100 -+++ wp_tray-0.5.3/src/SearchDialog.cc 2007-08-21 15:40:05.000000000 +0100 -@@ -319,7 +319,7 @@ +diff -ur wp_tray-0.5.3.orig/src/SearchDialog.cc wp_tray-0.5.3/src/SearchDialog.cc +--- wp_tray-0.5.3.orig/src/SearchDialog.cc 2008-10-01 23:46:10.000000000 +0200 ++++ wp_tray-0.5.3/src/SearchDialog.cc 2008-10-01 23:46:32.000000000 +0200 +@@ -317,15 +317,15 @@ + }// end if + else { - if(boost::regex_match(itDir->leaf(), _refRegex)) +- if(boost::regex_match(itDir->leaf(), _refRegex)) ++ if(boost::regex_match(itDir->path().leaf(), _refRegex)) { - _reflsResults.push_back((*itDir).native_directory_string()); + _reflsResults.push_back((*itDir).path().native_directory_string()); }// end if }// end else }// end try -diff -ru wp_tray-0.5.3.orig/src/Wallpapers.cc wp_tray-0.5.3/src/Wallpapers.cc ---- wp_tray-0.5.3.orig/src/Wallpapers.cc 2007-08-21 15:18:43.000000000 +0100 -+++ wp_tray-0.5.3/src/Wallpapers.cc 2007-08-21 15:41:56.000000000 +0100 -@@ -383,7 +383,7 @@ + catch(const std::exception & ex) + { +- std::cerr << "SearchDialog::WallpaperSearch() : " << itDir->leaf() << " " << ex.what() << std::endl; ++ std::cerr << "SearchDialog::WallpaperSearch() : " << itDir->path().leaf() << " " << ex.what() << std::endl; + }// end catch + }// end for + }// end SearchDialog::WallpaperSearch +diff -ur wp_tray-0.5.3.orig/src/Wallpapers.cc wp_tray-0.5.3/src/Wallpapers.cc +--- wp_tray-0.5.3.orig/src/Wallpapers.cc 2008-10-01 23:46:10.000000000 +0200 ++++ wp_tray-0.5.3/src/Wallpapers.cc 2008-10-01 23:46:49.000000000 +0200 +@@ -299,7 +299,7 @@ + try + { + // is it a directory and not hidden? +- if(fs::is_directory(*it) && it->leaf()[0] != '.') ++ if(fs::is_directory(*it) && it->path().leaf()[0] != '.') + { + if(fs::symbolic_link_exists(*it)) + { +@@ -317,7 +317,7 @@ + }// end if + else + { +- if(!m_pGconfClient->get_bool("/apps/wp_tray/b_img_check") || boost::regex_match(it->leaf(), m_regexImageCheck)) ++ if(!m_pGconfClient->get_bool("/apps/wp_tray/b_img_check") || boost::regex_match(it->path().leaf(), m_regexImageCheck)) + { + ++ _nFileCount; + }// end if +@@ -379,18 +379,18 @@ + }// end if + else + { +- if(!m_pGconfClient->get_bool("/apps/wp_tray/b_img_check") || boost::regex_match(it->leaf(), m_regexImageCheck)) ++ if(!m_pGconfClient->get_bool("/apps/wp_tray/b_img_check") || boost::regex_match(it->path().leaf(), m_regexImageCheck)) { if(-- _nFileIndex == 0) { @@ -22,3 +55,11 @@ diff -ru wp_tray-0.5.3.orig/src/Wallpapers.cc wp_tray-0.5.3/src/Wallpapers.cc }// end if }// end if }// end else + }// end try + catch(const std::exception & ex) + { +- std::cerr << "Wallpapers::GetDirectoryEntryAtIndex() : " << it->leaf() << " " << ex.what() << std::endl; ++ std::cerr << "Wallpapers::GetDirectoryEntryAtIndex() : " << it->path().leaf() << " " << ex.what() << std::endl; + }// end catch + }// end for + }// end Wallpapers::GetDirectoryEntryAtIndex diff --git a/wp_tray-0.5.3-missingdir.patch b/wp_tray-0.5.3-missingdir.patch index 8cf6318..b25319e 100644 --- a/wp_tray-0.5.3-missingdir.patch +++ b/wp_tray-0.5.3-missingdir.patch @@ -27,7 +27,7 @@ { try @@ -393,6 +396,8 @@ - std::cerr << "Wallpapers::GetDirectoryEntryAtIndex() : " << it->leaf() << " " << ex.what() << std::endl; + std::cerr << "Wallpapers::GetDirectoryEntryAtIndex() : " << it->path().leaf() << " " << ex.what() << std::endl; }// end catch }// end for + } catch (std::exception& e) { diff --git a/wp_tray.spec b/wp_tray.spec index 145efd1..c153db2 100644 --- a/wp_tray.spec +++ b/wp_tray.spec @@ -71,6 +71,9 @@ fi %{_sysconfdir}/gconf/schemas/*.schemas %changelog +* Wed Oct 1 2008 Denis - 0.5.3-8 +- Fixed boost patch + * Mon Feb 18 2008 Fedora Release Engineering - 0.5.3-7 - Autorebuild for GCC 4.3 From 76a8aac155ac95f3e083b6423d077de84d6f9d55 Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Thu, 18 Dec 2008 02:01:28 +0000 Subject: [PATCH 03/11] - Rebuild for boost-1.37.0. --- wp_tray.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wp_tray.spec b/wp_tray.spec index c153db2..8fde86a 100644 --- a/wp_tray.spec +++ b/wp_tray.spec @@ -1,6 +1,6 @@ Name: wp_tray Version: 0.5.3 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A wallpaper-changing applet for GNOME Group: Amusements/Graphics @@ -71,6 +71,9 @@ fi %{_sysconfdir}/gconf/schemas/*.schemas %changelog +* Wed Dec 17 2008 Benjamin Kosnik - 0.5.3-9 +- Rebuild for boost-1.37.0. + * Wed Oct 1 2008 Denis - 0.5.3-8 - Fixed boost patch From 2fd6174d238f112da2ffd63dffb2758ff8e8c002 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Thu, 26 Feb 2009 07:11:16 +0000 Subject: [PATCH 04/11] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- wp_tray.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wp_tray.spec b/wp_tray.spec index 8fde86a..f605e33 100644 --- a/wp_tray.spec +++ b/wp_tray.spec @@ -1,6 +1,6 @@ Name: wp_tray Version: 0.5.3 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A wallpaper-changing applet for GNOME Group: Amusements/Graphics @@ -71,6 +71,9 @@ fi %{_sysconfdir}/gconf/schemas/*.schemas %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 0.5.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Wed Dec 17 2008 Benjamin Kosnik - 0.5.3-9 - Rebuild for boost-1.37.0. From 9798b3eacff71fb785ea5a05080e093be6f93136 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 07:26:46 +0000 Subject: [PATCH 05/11] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- wp_tray.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wp_tray.spec b/wp_tray.spec index f605e33..88275cb 100644 --- a/wp_tray.spec +++ b/wp_tray.spec @@ -1,6 +1,6 @@ Name: wp_tray Version: 0.5.3 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A wallpaper-changing applet for GNOME Group: Amusements/Graphics @@ -71,6 +71,9 @@ fi %{_sysconfdir}/gconf/schemas/*.schemas %changelog +* Mon Jul 27 2009 Fedora Release Engineering - 0.5.3-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Wed Feb 25 2009 Fedora Release Engineering - 0.5.3-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From 42e902969cbbb6fa44474715cb7ecac4d55c4337 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:43:16 +0000 Subject: [PATCH 06/11] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f04f9a5..0e09e06 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: wp_tray -# $Id$ +# $Id: Makefile,v 1.1 2006/01/18 20:47:08 ivazquez Exp $ NAME := wp_tray 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 c06744a1c0733bed6febbd9fbc56481f42a2c892 Mon Sep 17 00:00:00 2001 From: Rahul Sundaram Date: Thu, 21 Jan 2010 20:23:26 +0000 Subject: [PATCH 07/11] - Rebuild for Boost soname bump --- wp_tray.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wp_tray.spec b/wp_tray.spec index 88275cb..7d4617d 100644 --- a/wp_tray.spec +++ b/wp_tray.spec @@ -1,6 +1,6 @@ Name: wp_tray Version: 0.5.3 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A wallpaper-changing applet for GNOME Group: Amusements/Graphics @@ -71,6 +71,9 @@ fi %{_sysconfdir}/gconf/schemas/*.schemas %changelog +* Fri Jan 22 2010 Rahul Sundaram - 0.5.3-12 +- Rebuild for Boost soname bump + * Mon Jul 27 2009 Fedora Release Engineering - 0.5.3-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From df4e941e5f18af88673319ca12321a2817f78d6a Mon Sep 17 00:00:00 2001 From: Denis Leroy Date: Thu, 18 Feb 2010 07:25:53 +0000 Subject: [PATCH 08/11] Added libboost_system to make new DSO link happy --- wp_tray.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/wp_tray.spec b/wp_tray.spec index 7d4617d..1315708 100644 --- a/wp_tray.spec +++ b/wp_tray.spec @@ -1,6 +1,6 @@ Name: wp_tray Version: 0.5.3 -Release: 12%{?dist} +Release: 13%{?dist} Summary: A wallpaper-changing applet for GNOME Group: Amusements/Graphics @@ -29,7 +29,7 @@ Wallpaper Tray is a GNOME applet used for changing your wallpaper. %patch3 -p1 -b .missingdir %build -%configure --with-boostfilesystem=%{_libdir}/libboost_filesystem.so \ +%configure --with-boostfilesystem='%{_libdir}/libboost_filesystem.so %{_libdir}/libboost_system.so' \ --with-boostregex=%{_libdir}/libboost_regex.so make %{?_smp_mflags} @@ -71,6 +71,9 @@ fi %{_sysconfdir}/gconf/schemas/*.schemas %changelog +* Thu Feb 18 2010 Denis Leroy - 0.5.3-13 +- Added libboost_system to make new DSO link happy + * Fri Jan 22 2010 Rahul Sundaram - 0.5.3-12 - Rebuild for Boost soname bump From 308ceebd1c1b944135a78f6cfe19a77ed050c058 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:25:37 +0000 Subject: [PATCH 09/11] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile 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 0e09e06..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: wp_tray -# $Id: Makefile,v 1.1 2006/01/18 20:47:08 ivazquez Exp $ -NAME := wp_tray -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) From 6146e45c4a610750c8e2c1ffa369e6dc2217828c Mon Sep 17 00:00:00 2001 From: Rahul Date: Mon, 28 Mar 2011 01:56:41 +0530 Subject: [PATCH 10/11] wp_tray is dead --- .gitignore | 1 + sources | 1 - wp_tray-0.5.3-boost.patch | 65 ----------- wp_tray-0.5.3-gnomewp.patch | 189 ------------------------------- wp_tray-0.5.3-missingdir.patch | 37 ------- wp_tray-0.5.3-notify.patch | 197 --------------------------------- wp_tray.spec | 127 --------------------- 7 files changed, 1 insertion(+), 616 deletions(-) delete mode 100644 sources delete mode 100644 wp_tray-0.5.3-boost.patch delete mode 100644 wp_tray-0.5.3-gnomewp.patch delete mode 100644 wp_tray-0.5.3-missingdir.patch delete mode 100644 wp_tray-0.5.3-notify.patch delete mode 100644 wp_tray.spec diff --git a/.gitignore b/.gitignore index ad252c8..68d537b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ wp_tray-0.5.3.tar.gz +/wp_tray-0.5.4.tar.gz diff --git a/sources b/sources deleted file mode 100644 index 2a639b3..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -27b878b8d3864787388b49e934c1ee60 wp_tray-0.5.3.tar.gz diff --git a/wp_tray-0.5.3-boost.patch b/wp_tray-0.5.3-boost.patch deleted file mode 100644 index db14db6..0000000 --- a/wp_tray-0.5.3-boost.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff -ur wp_tray-0.5.3.orig/src/SearchDialog.cc wp_tray-0.5.3/src/SearchDialog.cc ---- wp_tray-0.5.3.orig/src/SearchDialog.cc 2008-10-01 23:46:10.000000000 +0200 -+++ wp_tray-0.5.3/src/SearchDialog.cc 2008-10-01 23:46:32.000000000 +0200 -@@ -317,15 +317,15 @@ - }// end if - else - { -- if(boost::regex_match(itDir->leaf(), _refRegex)) -+ if(boost::regex_match(itDir->path().leaf(), _refRegex)) - { -- _reflsResults.push_back((*itDir).native_directory_string()); -+ _reflsResults.push_back((*itDir).path().native_directory_string()); - }// end if - }// end else - }// end try - catch(const std::exception & ex) - { -- std::cerr << "SearchDialog::WallpaperSearch() : " << itDir->leaf() << " " << ex.what() << std::endl; -+ std::cerr << "SearchDialog::WallpaperSearch() : " << itDir->path().leaf() << " " << ex.what() << std::endl; - }// end catch - }// end for - }// end SearchDialog::WallpaperSearch -diff -ur wp_tray-0.5.3.orig/src/Wallpapers.cc wp_tray-0.5.3/src/Wallpapers.cc ---- wp_tray-0.5.3.orig/src/Wallpapers.cc 2008-10-01 23:46:10.000000000 +0200 -+++ wp_tray-0.5.3/src/Wallpapers.cc 2008-10-01 23:46:49.000000000 +0200 -@@ -299,7 +299,7 @@ - try - { - // is it a directory and not hidden? -- if(fs::is_directory(*it) && it->leaf()[0] != '.') -+ if(fs::is_directory(*it) && it->path().leaf()[0] != '.') - { - if(fs::symbolic_link_exists(*it)) - { -@@ -317,7 +317,7 @@ - }// end if - else - { -- if(!m_pGconfClient->get_bool("/apps/wp_tray/b_img_check") || boost::regex_match(it->leaf(), m_regexImageCheck)) -+ if(!m_pGconfClient->get_bool("/apps/wp_tray/b_img_check") || boost::regex_match(it->path().leaf(), m_regexImageCheck)) - { - ++ _nFileCount; - }// end if -@@ -379,18 +379,18 @@ - }// end if - else - { -- if(!m_pGconfClient->get_bool("/apps/wp_tray/b_img_check") || boost::regex_match(it->leaf(), m_regexImageCheck)) -+ if(!m_pGconfClient->get_bool("/apps/wp_tray/b_img_check") || boost::regex_match(it->path().leaf(), m_regexImageCheck)) - { - if(-- _nFileIndex == 0) - { -- _szFile = (*it).native_directory_string(); -+ _szFile = (*it).path().native_directory_string(); - }// end if - }// end if - }// end else - }// end try - catch(const std::exception & ex) - { -- std::cerr << "Wallpapers::GetDirectoryEntryAtIndex() : " << it->leaf() << " " << ex.what() << std::endl; -+ std::cerr << "Wallpapers::GetDirectoryEntryAtIndex() : " << it->path().leaf() << " " << ex.what() << std::endl; - }// end catch - }// end for - }// end Wallpapers::GetDirectoryEntryAtIndex diff --git a/wp_tray-0.5.3-gnomewp.patch b/wp_tray-0.5.3-gnomewp.patch deleted file mode 100644 index f04292d..0000000 --- a/wp_tray-0.5.3-gnomewp.patch +++ /dev/null @@ -1,189 +0,0 @@ ---- wp_tray-0.5.3.orig/src/PreferencesDialog.cc 2006-11-15 01:43:23.000000000 +0100 -+++ wp_tray-0.5.3/src/PreferencesDialog.cc 2008-08-29 14:26:51.000000000 +0200 -@@ -46,7 +46,8 @@ - m_pCheckButtonTimeout(NULL), - m_pCheckButtonLogonNew(NULL), - m_pCheckButtonImageCheck(NULL), -- m_pCheckButtonFollowLinks(NULL) -+ m_pCheckButtonFollowLinks(NULL), -+ m_pCheckButtonUseStatics(NULL) - { - // set up the gconf client - m_pGconfClient = Gnome::Conf::Client::get_default_client(); -@@ -83,6 +84,7 @@ - m_pGlade->get_widget("checkbutton_logon_new", m_pCheckButtonLogonNew); - m_pGlade->get_widget("checkbutton_image_check", m_pCheckButtonImageCheck); - m_pGlade->get_widget("checkbutton_follow_links", m_pCheckButtonFollowLinks); -+ m_pGlade->get_widget("checkbutton_use_statics", m_pCheckButtonUseStatics); - - // grab the tree view - m_pGlade->get_widget("treeview_directories", m_pTreeView); -@@ -122,6 +124,7 @@ - m_pCheckButtonLogonNew->set_active(m_bWpLogon); - m_pCheckButtonImageCheck->set_active(m_bImgCheck); - m_pCheckButtonFollowLinks->set_active(m_bFollowLinks); -+ m_pCheckButtonUseStatics->set_active(m_bUseStatics); - - // give the window an icon - PreferencesDialog::set_icon_from_file(GNOMEICONDIR"/wp_tray-applet.png"); -@@ -275,6 +278,7 @@ - m_bWpLogon = m_pGconfClient->get_bool("/apps/wp_tray/b_wp_logon"); - m_bImgCheck = m_pGconfClient->get_bool("/apps/wp_tray/b_img_check"); - m_bFollowLinks = m_pGconfClient->get_bool("/apps/wp_tray/b_follow_links"); -+ m_bUseStatics = m_pGconfClient->get_bool("/apps/wp_tray/b_use_statics"); - m_szPictureOptions = m_pGconfClient->get_string("/desktop/gnome/background/picture_options"); - }// end PreferencesDialog::GetSettingsInGconf - -@@ -305,5 +309,6 @@ - m_pGconfClient->set("/apps/wp_tray/b_wp_logon", m_pCheckButtonLogonNew->get_active()); - m_pGconfClient->set("/apps/wp_tray/b_img_check", m_pCheckButtonImageCheck->get_active()); - m_pGconfClient->set("/apps/wp_tray/b_follow_links", m_pCheckButtonFollowLinks->get_active()); -+ m_pGconfClient->set("/apps/wp_tray/b_use_statics", m_pCheckButtonUseStatics->get_active()); - m_pGconfClient->set("/desktop/gnome/background/picture_options", m_pEntryMode->get_text()); - }// end PreferencesDialog::SetSettingsToGconf -diff -r -b -u old/src/PreferencesDialog.hh wp_tray-0.5.3/src/PreferencesDialog.hh ---- wp_tray-0.5.3/src/PreferencesDialog.hh~ 2006-11-15 00:40:19.000000000 +0100 -+++ wp_tray-0.5.3/src/PreferencesDialog.hh 2007-05-09 23:52:17.000000000 +0200 -@@ -80,6 +80,7 @@ - Gtk::CheckButton * m_pCheckButtonLogonNew; - Gtk::CheckButton * m_pCheckButtonImageCheck; - Gtk::CheckButton * m_pCheckButtonFollowLinks; -+ Gtk::CheckButton * m_pCheckButtonUseStatics; - Gtk::TreeView * m_pTreeView; - - PreferencesDialogModelColumns m_Model; -@@ -92,6 +93,7 @@ - bool m_bWpLogon; - bool m_bImgCheck; - bool m_bFollowLinks; -+ bool m_bUseStatics; - Glib::ustring m_szPictureOptions; - - };// end class PreferencesDialog -diff -r -b -u old/src/Wallpapers.cc wp_tray-0.5.3/src/Wallpapers.cc ---- wp_tray-0.5.3/src/Wallpapers.cc~ 2006-11-15 01:00:38.000000000 +0100 -+++ wp_tray-0.5.3/src/Wallpapers.cc 2007-05-09 23:52:17.000000000 +0200 -@@ -101,6 +101,7 @@ - - // grab all the directories - std::list lsWpDir = m_pGconfClient->get_string_list("/apps/wp_tray/dir_list"); -+ bool use_statics = m_pGconfClient->get_bool("/apps/wp_tray/b_use_statics"); - - for(std::list::iterator it = lsWpDir.begin(); it != lsWpDir.end(); ++ it) - { -@@ -108,6 +109,7 @@ - Wallpapers::CountDirectoryEntries(it->c_str(), nFileCount); - }// end for - -+ if (use_statics) - nStaticCount = Wallpapers::CountStatics(); - - if(nFileCount == 0 && nStaticCount == 0) -diff -r -b -u old/src/wp_tray_conf.glade wp_tray-0.5.3/src/wp_tray_conf.glade ---- wp_tray-0.5.3/src/wp_tray_conf.glade~ 2006-11-12 16:25:35.000000000 +0100 -+++ wp_tray-0.5.3/src/wp_tray_conf.glade 2007-05-09 23:52:17.000000000 +0200 -@@ -76,6 +76,7 @@ - - - -+ 4 - True - True - True -@@ -102,7 +103,7 @@ - True - GTK_POLICY_ALWAYS - GTK_POLICY_ALWAYS -- GTK_SHADOW_NONE -+ GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - -@@ -374,7 +375,7 @@ - - - True -- _Picture Selection Mode: -+ Picture _Selection Mode: - True - False - GTK_JUSTIFY_LEFT -@@ -552,6 +553,25 @@ - False - - -+ -+ -+ -+ True -+ True -+ A_dd GNOME Wallpapers to the List -+ True -+ GTK_RELIEF_NORMAL -+ True -+ False -+ False -+ True -+ -+ -+ 0 -+ False -+ False -+ -+ - - - 0 -diff -r -b -u old/src/wp_tray_search.glade wp_tray-0.5.3/src/wp_tray_search.glade ---- wp_tray-0.5.3/src/wp_tray_search.glade~ 2006-11-12 16:31:32.000000000 +0100 -+++ wp_tray-0.5.3/src/wp_tray_search.glade 2007-05-09 23:52:17.000000000 +0200 -@@ -10,7 +10,7 @@ - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER - False -- False -+ True - False - True - False -@@ -193,7 +193,7 @@ - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC -- GTK_SHADOW_NONE -+ GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - -@@ -270,7 +270,7 @@ - - True - True -- Deleted selected wallpapers. -+ Delete selected wallpapers. - True - GTK_RELIEF_NORMAL - True -diff -r -b -u old/wp_tray.schemas wp_tray-0.5.3/wp_tray.schemas ---- wp_tray-0.5.3/wp_tray.schemas~ 2006-10-25 22:50:08.000000000 +0200 -+++ wp_tray-0.5.3/wp_tray.schemas 2007-05-09 23:52:17.000000000 +0200 -@@ -14,6 +14,19 @@ - - - -+ /schemas/apps/wp_tray/b_use_statics -+ /apps/wp_tray/b_use_statics -+ wp_tray -+ bool -+ false -+ -+ Use Gnome Wallpapers -+ -+ Whether or not to add the standard Gnome wallpapers to the list. -+ -+ -+ -+ - /schemas/apps/wp_tray/b_img_check - /apps/wp_tray/b_img_check - wp_tray diff --git a/wp_tray-0.5.3-missingdir.patch b/wp_tray-0.5.3-missingdir.patch deleted file mode 100644 index b25319e..0000000 --- a/wp_tray-0.5.3-missingdir.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- wp_tray-0.5.3.orig/src/Wallpapers.cc 2008-08-29 14:31:43.000000000 +0200 -+++ wp_tray-0.5.3/src/Wallpapers.cc 2008-08-29 14:31:49.000000000 +0200 -@@ -294,6 +294,7 @@ - { - fs::directory_iterator itEnd; - -+ try { - for(fs::directory_iterator it(_pathCurrent); it != itEnd; ++ it) - { - try -@@ -328,7 +329,8 @@ - std::cerr << "Wallpapers::CountEntriesInDirectory() : " << ex.what() << std::endl; - }// end catch - }// end for -- -+ } catch (std::exception& e) { -+ } - return _nFileCount; - }// end Wallpapers::CountDirectoryEntries - -@@ -357,6 +359,7 @@ - return; - }// end if - -+ try { - for(fs::directory_iterator it(_pathCurrent); it != itEnd && _nFileIndex != 0; ++ it) - { - try -@@ -393,6 +396,8 @@ - std::cerr << "Wallpapers::GetDirectoryEntryAtIndex() : " << it->path().leaf() << " " << ex.what() << std::endl; - }// end catch - }// end for -+ } catch (std::exception& e) { -+ } - }// end Wallpapers::GetDirectoryEntryAtIndex - - //------------------------------------------------------------------------ diff --git a/wp_tray-0.5.3-notify.patch b/wp_tray-0.5.3-notify.patch deleted file mode 100644 index 5bab6f8..0000000 --- a/wp_tray-0.5.3-notify.patch +++ /dev/null @@ -1,197 +0,0 @@ ---- wp_tray-0.5.3/src/PreferencesDialog.cc~ 2007-05-09 23:57:01.000000000 +0200 -+++ wp_tray-0.5.3/src/PreferencesDialog.cc 2007-05-09 23:39:35.000000000 +0200 -@@ -47,7 +47,8 @@ - m_pCheckButtonLogonNew(NULL), - m_pCheckButtonImageCheck(NULL), - m_pCheckButtonFollowLinks(NULL), -- m_pCheckButtonUseStatics(NULL) -+ m_pCheckButtonUseStatics(NULL), -+ m_pCheckButtonNotifyChange(NULL) - { - // set up the gconf client - m_pGconfClient = Gnome::Conf::Client::get_default_client(); -@@ -85,6 +86,7 @@ - m_pGlade->get_widget("checkbutton_image_check", m_pCheckButtonImageCheck); - m_pGlade->get_widget("checkbutton_follow_links", m_pCheckButtonFollowLinks); - m_pGlade->get_widget("checkbutton_use_statics", m_pCheckButtonUseStatics); -+ m_pGlade->get_widget("checkbutton_notify_change", m_pCheckButtonNotifyChange); - - // grab the tree view - m_pGlade->get_widget("treeview_directories", m_pTreeView); -@@ -125,6 +127,7 @@ - m_pCheckButtonImageCheck->set_active(m_bImgCheck); - m_pCheckButtonFollowLinks->set_active(m_bFollowLinks); - m_pCheckButtonUseStatics->set_active(m_bUseStatics); -+ m_pCheckButtonNotifyChange->set_active(m_bNotifyChange); - - // give the window an icon - PreferencesDialog::set_icon_from_file(GNOMEICONDIR"/wp_tray-applet.png"); -@@ -279,6 +282,7 @@ - m_bImgCheck = m_pGconfClient->get_bool("/apps/wp_tray/b_img_check"); - m_bFollowLinks = m_pGconfClient->get_bool("/apps/wp_tray/b_follow_links"); - m_bUseStatics = m_pGconfClient->get_bool("/apps/wp_tray/b_use_statics"); -+ m_bNotifyChange = m_pGconfClient->get_bool("/apps/wp_tray/b_notify_change"); - m_szPictureOptions = m_pGconfClient->get_string("/desktop/gnome/background/picture_options"); - }// end PreferencesDialog::GetSettingsInGconf - -@@ -310,5 +314,6 @@ - m_pGconfClient->set("/apps/wp_tray/b_img_check", m_pCheckButtonImageCheck->get_active()); - m_pGconfClient->set("/apps/wp_tray/b_follow_links", m_pCheckButtonFollowLinks->get_active()); - m_pGconfClient->set("/apps/wp_tray/b_use_statics", m_pCheckButtonUseStatics->get_active()); -+ m_pGconfClient->set("/apps/wp_tray/b_notify_change", m_pCheckButtonNotifyChange->get_active()); - m_pGconfClient->set("/desktop/gnome/background/picture_options", m_pEntryMode->get_text()); - }// end PreferencesDialog::SetSettingsToGconf ---- wp_tray-0.5.3/src/PreferencesDialog.hh~ 2007-05-10 00:11:44.000000000 +0200 -+++ wp_tray-0.5.3/src/PreferencesDialog.hh 2007-05-10 00:12:42.000000000 +0200 -@@ -81,6 +81,7 @@ - Gtk::CheckButton * m_pCheckButtonImageCheck; - Gtk::CheckButton * m_pCheckButtonFollowLinks; - Gtk::CheckButton * m_pCheckButtonUseStatics; -+ Gtk::CheckButton * m_pCheckButtonNotifyChange; - Gtk::TreeView * m_pTreeView; - - PreferencesDialogModelColumns m_Model; -@@ -94,6 +95,7 @@ - bool m_bImgCheck; - bool m_bFollowLinks; - bool m_bUseStatics; -+ bool m_bNotifyChange; - Glib::ustring m_szPictureOptions; - - };// end class PreferencesDialog -diff -b -u -r old/src/Wallpapers.cc new/src/Wallpapers.cc ---- wp_tray-0.5.3/src/Wallpapers.cc~ 2007-05-09 23:57:01.000000000 +0200 -+++ wp_tray-0.5.3/src/Wallpapers.cc 2007-05-09 23:41:19.000000000 +0200 -@@ -133,12 +133,13 @@ - m_szFile = Wallpapers::GetStaticAtIndex(nRandomIndex % nStaticCount); - }// end else - -+ bool notify_change = m_pGconfClient->get_bool("/apps/wp_tray/b_notify_change"); - // set new in gconf - if(m_szFile.length() > 0) - { - m_pApplet->RenderThumbnail(m_szFile); - -- if(_bImediate == true) -+ if(_bImediate == true || notify_change == false) - { - m_pGconfClient->set("/desktop/gnome/background/picture_filename", m_szFile); - -diff -b -u -r old/src/wp_tray_conf.glade new/src/wp_tray_conf.glade ---- wp_tray-0.5.3/src/wp_tray_conf.glade~ 2007-05-09 23:57:01.000000000 +0200 -+++ wp_tray-0.5.3/src/wp_tray_conf.glade 2007-05-09 23:46:07.000000000 +0200 -@@ -216,7 +216,7 @@ - - - True -- _Rotate Interval (minutes): -+ Rotate Interval (minutes): - True - False - GTK_JUSTIFY_LEFT -@@ -275,7 +275,7 @@ - - - True -- _Picture options: -+ Picture options: - True - False - GTK_JUSTIFY_LEFT -@@ -375,7 +375,7 @@ - - - True -- Picture _Selection Mode: -+ Picture Selection Mode: - True - False - GTK_JUSTIFY_LEFT -@@ -476,7 +476,7 @@ - 10 - True - False -- 12 -+ 8 - - - -@@ -520,7 +520,7 @@ - - True - True -- _Check Files are Images -+ Check Files are _Images - True - GTK_RELIEF_NORMAL - True -@@ -572,6 +572,25 @@ - False - - -+ -+ -+ -+ True -+ True -+ Notify on _Wallpaper Change -+ True -+ GTK_RELIEF_NORMAL -+ True -+ False -+ False -+ True -+ -+ -+ 0 -+ False -+ False -+ -+ - - - 0 -diff -b -u -r old/src/wp_tray_search.glade new/src/wp_tray_search.glade ---- wp_tray-0.5.3/src/wp_tray_search.glade~ 2007-05-09 23:57:01.000000000 +0200 -+++ wp_tray-0.5.3/src/wp_tray_search.glade 2007-05-09 23:50:45.000000000 +0200 -@@ -33,7 +33,7 @@ - Wallpaper Tray Search - Enter some text to search for, any wallpapers in your collection with file names similar to your search text will be listed. - --Regular expressions are supported. -+Regular expressions are supported. Leave search box empty to list all available wallpapers. - - - -@@ -182,7 +182,7 @@ - - - 0 -- True -+ False - True - - -diff -b -u -r old/wp_tray.schemas new/wp_tray.schemas ---- wp_tray-0.5.3/wp_tray.schemas~ 2007-05-09 23:57:01.000000000 +0200 -+++ wp_tray-0.5.3/wp_tray.schemas 2007-05-09 23:42:22.000000000 +0200 -@@ -27,6 +27,19 @@ - - - -+ /schemas/apps/wp_tray/b_notify_change -+ /apps/wp_tray/b_notify_change -+ wp_tray -+ bool -+ true -+ -+ Notify user on change -+ -+ Whether or not to notify the user when the wallpaper is about to change. -+ -+ -+ -+ - /schemas/apps/wp_tray/b_img_check - /apps/wp_tray/b_img_check - wp_tray diff --git a/wp_tray.spec b/wp_tray.spec deleted file mode 100644 index 1315708..0000000 --- a/wp_tray.spec +++ /dev/null @@ -1,127 +0,0 @@ -Name: wp_tray -Version: 0.5.3 -Release: 13%{?dist} -Summary: A wallpaper-changing applet for GNOME - -Group: Amusements/Graphics -License: GPLv2 -URL: http://planetearthworm.com/projects/wp_tray/ -Source0: http://planetearthworm.com/projects/wp_tray/files/%{name}-%{version}.tar.gz -Patch0: wp_tray-0.5.3-gnomewp.patch -Patch1: wp_tray-0.5.3-notify.patch -Patch2: wp_tray-0.5.3-boost.patch -Patch3: wp_tray-0.5.3-missingdir.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: gettext libglademm24-devel libgnomecanvasmm26-devel -BuildRequires: gconfmm26-devel libgnomemm26-devel libgnomeuimm26-devel -BuildRequires: gnome-panel-devel boost-devel -BuildRequires: libxml++-devel libnotify-devel - -%description -Wallpaper Tray is a GNOME applet used for changing your wallpaper. - -%prep -%setup -q -%patch0 -p1 -b .gnomewp -%patch1 -p1 -b .notify -%patch2 -p1 -b .boost -%patch3 -p1 -b .missingdir - -%build -%configure --with-boostfilesystem='%{_libdir}/libboost_filesystem.so %{_libdir}/libboost_system.so' \ - --with-boostregex=%{_libdir}/libboost_regex.so -make %{?_smp_mflags} - -%install -rm -rf $RPM_BUILD_ROOT -export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 -make install DESTDIR=$RPM_BUILD_ROOT -%find_lang %{name} - -%clean -rm -rf $RPM_BUILD_ROOT - -%post -export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` -gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/wp_tray.schemas > /dev/null || : -killall -HUP gconfd-2 &>/dev/null || : - -%postun -if [ "$1" -gt 1 ]; then - export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` - gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/wp_tray.schemas >/dev/null || : - killall -HUP gconfd-2 &>/dev/null || : -fi - -%preun -if [ "$1" -eq 0 ]; then - export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` - gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/wp_tray.schemas > /dev/null || : - killall -HUP gconfd-2 &>/dev/null || : -fi - -%files -f %{name}.lang -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README -%{_datadir}/%{name} -%{_datadir}/pixmaps/* -%{_libdir}/bonobo/servers/*.server -%{_libexecdir}/* -%{_sysconfdir}/gconf/schemas/*.schemas - -%changelog -* Thu Feb 18 2010 Denis Leroy - 0.5.3-13 -- Added libboost_system to make new DSO link happy - -* Fri Jan 22 2010 Rahul Sundaram - 0.5.3-12 -- Rebuild for Boost soname bump - -* Mon Jul 27 2009 Fedora Release Engineering - 0.5.3-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Feb 25 2009 Fedora Release Engineering - 0.5.3-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Wed Dec 17 2008 Benjamin Kosnik - 0.5.3-9 -- Rebuild for boost-1.37.0. - -* Wed Oct 1 2008 Denis - 0.5.3-8 -- Fixed boost patch - -* Mon Feb 18 2008 Fedora Release Engineering - 0.5.3-7 -- Autorebuild for GCC 4.3 - -* Thu Dec 13 2007 Denis Leroy - 0.5.3-6 -- Added patch to fix missing dir crash - -* Fri Aug 3 2007 Denis Leroy - 0.5.3-5 -- Changed License field to new guidelines -- Added patch to support new boost library - -* Wed May 9 2007 Denis Leroy - 0.5.3-4 -- Added patch to make change lib-notifications optional -- Cleaned up gnomewp patch - -* Tue May 8 2007 Denis Leroy - 0.5.3-3 -- Added patch to make gnome wp addition optional, minor glade fixes - -* Fri Dec 8 2006 Denis Leroy - 0.5.3 -- Update to 0.5.3, patches integrated upstream -- Added libxml++ and libnotify dependencies - -* Mon Sep 11 2006 Denis Leroy - 0.5.1-4 -- Added patches to fix many bugs (see bug 205869) - -* Sun Sep 3 2006 Denis Leroy - 0.5.1-3 -- FE6 Rebuild - -* Mon Feb 13 2006 Ignacio Vazquez-Abrams 0.5.1-2 -- Rebuild for Fedora Extras 5 - -* Tue Jan 17 2006 Ignacio Vazquez-Abrams 0.5.1-1 -- Upstream update -- Merge Chris Chabot's spec file changes - -* Mon Jan 2 2006 Ignacio Vazquez-Abrams 0.4.6-1 -- Initial RPM release From e309ad14dba3a7287f02d7c897c888f50158b167 Mon Sep 17 00:00:00 2001 From: Rahul Date: Mon, 28 Mar 2011 01:57:26 +0530 Subject: [PATCH 11/11] Package is retired --- .gitignore | 2 -- dead.package | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 68d537b..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -wp_tray-0.5.3.tar.gz -/wp_tray-0.5.4.tar.gz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..f2396d2 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Package is retired \ No newline at end of file