rpms/solang/F-11 solang-0001-Silenced-Gtk-warnings.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 solang.spec, 1.1, 1.2 sources, 1.2, 1.3 main-window.cpp.patch, 1.1, NONE solang.desktop, 1.1, NONE solang.png, 1.1, NONE
Hicham HAOUARI
hicham at fedoraproject.org
Mon Sep 21 06:42:16 UTC 2009
- Previous message (by thread): rpms/solang/devel solang-0001-Silenced-Gtk-warnings.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 solang.spec, 1.2, 1.3 sources, 1.2, 1.3 main-window.cpp.patch, 1.1, NONE solang.desktop, 1.1, NONE solang.png, 1.1, NONE
- Next message (by thread): rpms/qlandkartegt/F-11 .cvsignore, 1.10, 1.11 qlandkartegt.spec, 1.10, 1.11 sources, 1.10, 1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: hicham
Update of /cvs/pkgs/rpms/solang/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30482/F-11
Modified Files:
.cvsignore import.log solang.spec sources
Added Files:
solang-0001-Silenced-Gtk-warnings.patch
Removed Files:
main-window.cpp.patch solang.desktop solang.png
Log Message:
solang-0001-Silenced-Gtk-warnings.patch:
application/main-window.cpp | 5 ++++-
attribute/date-manager.cpp | 5 ++++-
attribute/property-manager.cpp | 5 ++++-
attribute/tag-manager.cpp | 5 ++++-
importer/importer.cpp | 6 +++++-
renderer/browser-renderer.cpp | 5 ++++-
renderer/editor-renderer.cpp | 5 ++++-
renderer/enlarged-renderer.cpp | 5 ++++-
renderer/slideshow-renderer.cpp | 5 ++++-
renderer/slideshow-window.cpp | 5 ++++-
renderer/thumbnail-view.cpp | 6 ++++--
11 files changed, 45 insertions(+), 12 deletions(-)
--- NEW FILE solang-0001-Silenced-Gtk-warnings.patch ---
>From 8fc9488ed55106ff3e8fb28130d8a77b63f716c3 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <rishi at gnu.org>
Date: Mon, 21 Sep 2009 02:53:21 +0300
Subject: [PATCH] Silenced Gtk+ warnings.
The Gtk::ActionGroups need to be explicitly named:
https://bugzilla.gnome.org/501746
---
src/application/main-window.cpp | 5 ++++-
src/attribute/date-manager.cpp | 5 ++++-
src/attribute/property-manager.cpp | 5 ++++-
src/attribute/tag-manager.cpp | 5 ++++-
src/importer/importer.cpp | 6 +++++-
src/renderer/browser-renderer.cpp | 5 ++++-
src/renderer/editor-renderer.cpp | 5 ++++-
src/renderer/enlarged-renderer.cpp | 5 ++++-
src/renderer/slideshow-renderer.cpp | 5 ++++-
src/renderer/slideshow-window.cpp | 5 ++++-
src/renderer/thumbnail-view.cpp | 5 ++++-
11 files changed, 45 insertions(+), 11 deletions(-)
diff --git a/src/application/main-window.cpp b/src/application/main-window.cpp
index c0f521f..87bb9e1 100644
--- a/src/application/main-window.cpp
+++ b/src/application/main-window.cpp
@@ -198,7 +198,10 @@ DockHider::operator()(DockObjectPtr const & dock_object) throw()
MainWindow::MainWindow() throw() :
Gtk::Window(Gtk::WINDOW_TOPLEVEL),
application_(),
- actionGroup_(Gtk::ActionGroup::create()),
+ actionGroup_(Gtk::ActionGroup::create(
+ Glib::ustring::compose("%1:%2",
+ __FILE__,
+ __LINE__))),
uiManager_(Gtk::UIManager::create()),
uiID_(uiManager_->add_ui_from_file(uiFile)),
vBox_(false, 0),
diff --git a/src/attribute/date-manager.cpp b/src/attribute/date-manager.cpp
index 38ba441..912466d 100644
--- a/src/attribute/date-manager.cpp
+++ b/src/attribute/date-manager.cpp
@@ -42,7 +42,10 @@ static const std::string uiFile
DateManager::DateManager() throw() :
Plugin(),
application_(),
- actionGroup_(Gtk::ActionGroup::create()),
+ actionGroup_(Gtk::ActionGroup::create(
+ Glib::ustring::compose("%1:%2",
+ __FILE__,
+ __LINE__))),
uiID_( 1 ),
dockItemName_("date-dock-item"),
dockItemTitle_(_("Picture Taken Date")),
diff --git a/src/attribute/property-manager.cpp b/src/attribute/property-manager.cpp
index 435002f..264fa92 100644
--- a/src/attribute/property-manager.cpp
+++ b/src/attribute/property-manager.cpp
@@ -42,7 +42,10 @@ static const std::string uiFile
PropertyManager::PropertyManager() throw() :
Plugin(),
application_(),
- actionGroup_(Gtk::ActionGroup::create()),
+ actionGroup_(Gtk::ActionGroup::create(
+ Glib::ustring::compose("%1:%2",
+ __FILE__,
+ __LINE__))),
uiID_( 1 ),
dockItemName_("property-managers-dock-item"),
dockItemTitle_(_("Properties")),
diff --git a/src/attribute/tag-manager.cpp b/src/attribute/tag-manager.cpp
index 7821113..d6893be 100644
--- a/src/attribute/tag-manager.cpp
+++ b/src/attribute/tag-manager.cpp
@@ -48,7 +48,10 @@ TagManager::TagManager() throw() :
Plugin(),
application_(),
iconFactory_(Gtk::IconFactory::create()),
- actionGroup_(Gtk::ActionGroup::create()),
+ actionGroup_(Gtk::ActionGroup::create(
+ Glib::ustring::compose("%1:%2",
+ __FILE__,
+ __LINE__))),
uiID_(0),
dockItemName_("tag-managers-dock-item"),
dockItemTitle_(_("Tags")),
diff --git a/src/importer/importer.cpp b/src/importer/importer.cpp
index a04fb7a..6267c6a 100644
--- a/src/importer/importer.cpp
+++ b/src/importer/importer.cpp
@@ -49,7 +49,11 @@ Importer::Importer(const IPhotoSourcePtr & photo_source, bool standard)
application_(NULL),
photoSource_(photo_source),
standard_(standard),
- actionGroup_(Gtk::ActionGroup::create()),
+ actionGroup_(Gtk::ActionGroup::create(
+ Glib::ustring::compose("%1:%2,%3",
+ __FILE__,
+ __LINE__,
+ photo_source->get_name()))),
standardUIID_(0),
uiID_(0),
signalPhotoImportBegin_(),
diff --git a/src/renderer/browser-renderer.cpp b/src/renderer/browser-renderer.cpp
index ce8f4eb..96293a7 100644
--- a/src/renderer/browser-renderer.cpp
+++ b/src/renderer/browser-renderer.cpp
@@ -69,7 +69,10 @@ BrowserRenderer::BrowserRenderer() throw() :
sigc::trackable(),
application_(NULL),
iconFactory_(Gtk::IconFactory::create()),
- actionGroup_(Gtk::ActionGroup::create()),
+ actionGroup_(Gtk::ActionGroup::create(
+ Glib::ustring::compose("%1:%2",
+ __FILE__,
+ __LINE__))),
uiID_(0),
uiIDThumbnail_(0),
dockItemName_("browser-dock-item"),
diff --git a/src/renderer/editor-renderer.cpp b/src/renderer/editor-renderer.cpp
index 10eea0e..47352c1 100644
--- a/src/renderer/editor-renderer.cpp
+++ b/src/renderer/editor-renderer.cpp
@@ -93,7 +93,10 @@ EditorRenderer::EditorRenderer() throw() :
IRenderer(),
sigc::trackable(),
application_(NULL),
- actionGroup_(Gtk::ActionGroup::create()),
+ actionGroup_(Gtk::ActionGroup::create(
+ Glib::ustring::compose("%1:%2",
+ __FILE__,
+ __LINE__))),
uiID_(0),
dockItemName_("editor-dock-item"),
dockItemTitle_(_("Editor")),
diff --git a/src/renderer/enlarged-renderer.cpp b/src/renderer/enlarged-renderer.cpp
index 4f4dafb..2a47a17 100644
--- a/src/renderer/enlarged-renderer.cpp
+++ b/src/renderer/enlarged-renderer.cpp
@@ -66,7 +66,10 @@ EnlargedRenderer::EnlargedRenderer() throw() :
sigc::trackable(),
application_(NULL),
iconFactory_(Gtk::IconFactory::create()),
- actionGroup_(Gtk::ActionGroup::create()),
+ actionGroup_(Gtk::ActionGroup::create(
+ Glib::ustring::compose("%1:%2",
+ __FILE__,
+ __LINE__))),
uiID_(0),
dockItemName_("enlarged-dock-item"),
dockItemTitle_(_("Enlarged")),
diff --git a/src/renderer/slideshow-renderer.cpp b/src/renderer/slideshow-renderer.cpp
index 1c482b9..a8b6a9b 100644
--- a/src/renderer/slideshow-renderer.cpp
+++ b/src/renderer/slideshow-renderer.cpp
@@ -45,7 +45,10 @@ SlideshowRenderer::SlideshowRenderer() throw() :
IRenderer(),
sigc::trackable(),
application_(0),
- actionGroup_(Gtk::ActionGroup::create()),
+ actionGroup_(Gtk::ActionGroup::create(
+ Glib::ustring::compose("%1:%2",
+ __FILE__,
+ __LINE__))),
uiID_(0),
modelIter_(),
previousRenderer_(),
diff --git a/src/renderer/slideshow-window.cpp b/src/renderer/slideshow-window.cpp
index c31f978..5737758 100644
--- a/src/renderer/slideshow-window.cpp
+++ b/src/renderer/slideshow-window.cpp
@@ -54,7 +54,10 @@ image_view_on_scroll_event(GtkImageView * view,
SlideshowWindow::SlideshowWindow() throw() :
Gtk::Window(Gtk::WINDOW_TOPLEVEL),
- actionGroup_(Gtk::ActionGroup::create()),
+ actionGroup_(Gtk::ActionGroup::create(
+ Glib::ustring::compose("%1:%2",
+ __FILE__,
+ __LINE__))),
uiManager_(Gtk::UIManager::create()),
uiID_(uiManager_->add_ui_from_file(uiFile)),
vBox_(false, 0),
diff --git a/src/renderer/thumbnail-view.cpp b/src/renderer/thumbnail-view.cpp
index b840e99..56c5cad 100644
--- a/src/renderer/thumbnail-view.cpp
+++ b/src/renderer/thumbnail-view.cpp
@@ -38,7 +38,10 @@ ThumbnailView::ThumbnailView(gint thumbnail_renderer_width,
gint thumbnail_renderer_height) throw() :
Gtk::IconView(),
selectedItems_(0),
- actionGroup_(Gtk::ActionGroup::create()),
+ actionGroup_(Gtk::ActionGroup::create(
+ Glib::ustring::compose("%1:%2",
+ __FILE__,
+ __LINE__))),
uiManager_(Gtk::UIManager::create()),
uiID_(uiManager_->add_ui_from_file(uiFile)),
menu_(NULL),
--
1.6.2.5
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/solang/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 14 Jul 2009 14:07:44 -0000 1.2
+++ .cvsignore 21 Sep 2009 06:42:14 -0000 1.3
@@ -1 +1 @@
-Solang-0.2.tar.gz
+solang-0.3.tar.gz
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/solang/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log 14 Jul 2009 14:07:44 -0000 1.1
+++ import.log 21 Sep 2009 06:42:15 -0000 1.2
@@ -1 +1,2 @@
solang-0_2-2_fc11:F-11:solang-0.2-2.fc11.src.rpm:1247580426
+solang-0_3-1_fc11:F-11:solang-0.3-1.fc11.src.rpm:1253515301
Index: solang.spec
===================================================================
RCS file: /cvs/pkgs/rpms/solang/F-11/solang.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- solang.spec 14 Jul 2009 14:07:44 -0000 1.1
+++ solang.spec 21 Sep 2009 06:42:16 -0000 1.2
@@ -1,21 +1,14 @@
Name: solang
-Version: 0.2
-Release: 2%{?dist}
+Version: 0.3
+Release: 1%{?dist}
Summary: A photo manager for GNOME
-%define name_ Solang
-
Group: Applications/Multimedia
License: GPLv3+
URL: https://savannah.nongnu.org/projects/solang/
-Source0: http://download.savannah.gnu.org/releases-noredirect/solang/%{name_}-%{version}.tar.gz
+Source0: http://download.savannah.nongnu.org/releases/solang/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source1: solang.desktop
-Source2: solang.png
-
-#Patch0: adds icon to main window, and starts the main window maximized
-Patch0: main-window.cpp.patch
BuildRequires: intltool
BuildRequires: cairomm-devel
@@ -31,8 +24,15 @@ BuildRequires: desktop-file-utils
BuildRequires: flickcurl-devel
BuildRequires: libsoup-devel
BuildRequires: webkitgtk-devel
+BuildRequires: babl-devel
+BuildRequires: gegl-devel
Requires: compat-libgda-sqlite
+Requires: babl
+Requires: gegl
+
+#Patch0: http://lists.gnu.org/archive/html/solang-devel/2009-09/msg00018.html
+Patch0: %{name}-0001-Silenced-Gtk-warnings.patch
%description
Solang is a free photo manager that will act as a front-end for
@@ -46,9 +46,8 @@ alternative that does not place humongou
even to meet basic functionality.
%prep
-%setup -q -n %{name_}-%{version}
-%patch0 -p1 -b %{name_}-%{version}
-
+%setup -q -n %{name}-%{version}
+%patch0 -p1
%build
%configure --docdir=%{_docdir}/%{name}-%{version}
@@ -58,27 +57,50 @@ make %{?smp_flags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
-%{__mkdir_p} $RPM_BUILD_ROOT{%{_datadir}/applications,%{_datadir}/pixmaps}
-%{__install} -p -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
+%find_lang %{name}
desktop-file-install \
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
-%{SOURCE1}
+${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
%clean
rm -rf $RPM_BUILD_ROOT
-%files
+%post
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+ touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
+%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README
%{_bindir}/%{name}
%{_datadir}/%{name}/solang-layout.xml
%{_datadir}/%{name}/ui
%{_datadir}/%{name}/pixmaps
-%{_datadir}/pixmaps/%{name}.png
%{_datadir}/applications/%{name}.desktop
+%{_datadir}/icons/hicolor/128x128/apps/solang.png
+%{_datadir}/icons/hicolor/16x16/apps/solang.png
+%{_datadir}/icons/hicolor/22x22/apps/solang.png
+%{_datadir}/icons/hicolor/24x24/apps/solang.png
+%{_datadir}/icons/hicolor/32x32/apps/solang.png
+%{_datadir}/icons/hicolor/48x48/apps/solang.png
+%{_datadir}/icons/hicolor/96x96/apps/solang.png
+%{_datadir}/icons/hicolor/scalable/apps/solang.svg
%changelog
+* Mon Sep 21 2009 Hicham HAOUARI <hicham.haouari at gmail.com> - 0.3-1
+- New upstream release
+- Added a patch from upstream to silence some Gtk+ warnings
+
* Thu Jul 11 2009 Hicham HAOUARI <hicham.haouari at gmail.com> - 0.2-2
- Cleaned up the dependencies
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/solang/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 14 Jul 2009 14:07:44 -0000 1.2
+++ sources 21 Sep 2009 06:42:16 -0000 1.3
@@ -1 +1 @@
-20a05edee2137c76add270452a1ab4d7 Solang-0.2.tar.gz
+6f82d34174815deacb4392b88a4134ed solang-0.3.tar.gz
--- main-window.cpp.patch DELETED ---
--- solang.desktop DELETED ---
- Previous message (by thread): rpms/solang/devel solang-0001-Silenced-Gtk-warnings.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 solang.spec, 1.2, 1.3 sources, 1.2, 1.3 main-window.cpp.patch, 1.1, NONE solang.desktop, 1.1, NONE solang.png, 1.1, NONE
- Next message (by thread): rpms/qlandkartegt/F-11 .cvsignore, 1.10, 1.11 qlandkartegt.spec, 1.10, 1.11 sources, 1.10, 1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list