packages: gdlmm/gdlmm.spec, gdlmm/gdlmm-api-3.4.patch (NEW)=?UTF-8?Q?=20?=- added patch t...
kiesiu
kiesiu at pld-linux.org
Thu Jun 28 21:58:57 CEST 2012
Author: kiesiu Date: Thu Jun 28 19:58:57 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- added patch to use gdl 3.4 API
- drop *.la file
- disable silent rules; rel. 6
---- Files affected:
packages/gdlmm:
gdlmm.spec (1.5 -> 1.6) , gdlmm-api-3.4.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/gdlmm/gdlmm.spec
diff -u packages/gdlmm/gdlmm.spec:1.5 packages/gdlmm/gdlmm.spec:1.6
--- packages/gdlmm/gdlmm.spec:1.5 Fri Jun 22 22:46:22 2012
+++ packages/gdlmm/gdlmm.spec Thu Jun 28 21:58:51 2012
@@ -3,14 +3,15 @@
Summary(pl.UTF-8): Wiązania C++ do biblioteko gdl
Name: gdlmm
Version: 3.2.1
-Release: 5
+Release: 6
License: LGPL v2.1
Group: Libraries
Source0: http://ftp.gnome.org/pub/GNOME/sources/gdlmm/3.2/%{name}-%{version}.tar.xz
# Source0-md5: d07999618fcec79a2287bb23d01fc4d2
+Patch0: %{name}-api-3.4.patch
BuildRequires: autoconf
BuildRequires: automake >= 1:1.9
-BuildRequires: gdl-devel >= 3.0.0
+BuildRequires: gdl-devel >= 3.4.0
BuildRequires: glibmm-devel >= 2.16.0
BuildRequires: gtkmm3-devel >= 3.0.0
BuildRequires: libtool
@@ -21,14 +22,14 @@
C++ bindings for gdl library.
%description -l pl.UTF-8
-Wiązania C++ do biblioteki gdl..
+Wiązania C++ do biblioteki gdl.
%package devel
Summary: Header files for gdlmm library
Summary(pl.UTF-8): Pliki nagłówkowe biblioteki gdlmm
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: gdl-devel >= 3.0.0
+Requires: gdl-devel >= 3.4.0
Requires: glibmm-devel >= 2.12.8
Requires: gtkmm3-devel >= 3.0.0
@@ -63,10 +64,12 @@
%prep
%setup -q
+%patch0 -p1
%build
%configure \
--enable-static \
+ --disable-silent-rules
%{__make}
@@ -76,6 +79,8 @@
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
+%{__rm} $RPM_BUILD_ROOT/%{_libdir}/libgdlmm-3.0.la
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -92,7 +97,6 @@
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libgdlmm-3.0.so
%{_libdir}/gdlmm-3.0
-%{_libdir}/libgdlmm-3.0.la
%{_includedir}/gdlmm-3.0
%{_pkgconfigdir}/gdlmm-3.0.pc
@@ -111,6 +115,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.6 2012/06/28 19:58:51 kiesiu
+- added patch to use gdl 3.4 API
+- drop *.la file
+- disable silent rules; rel. 6
+
Revision 1.5 2012/06/22 20:46:22 megabajt
- release 5 (by relup.sh)
================================================================
Index: packages/gdlmm/gdlmm-api-3.4.patch
diff -u /dev/null packages/gdlmm/gdlmm-api-3.4.patch:1.1
--- /dev/null Thu Jun 28 21:58:57 2012
+++ packages/gdlmm/gdlmm-api-3.4.patch Thu Jun 28 21:58:51 2012
@@ -0,0 +1,97 @@
+iff -uNr gdlmm-3.2.1/gdl/gdlmm/docklayout.cc gdlmm-3.3.2/gdl/gdlmm/docklayout.cc
+--- gdlmm-3.2.1/gdl/gdlmm/docklayout.cc 2011-10-17 22:02:12.000000000 +0200
++++ gdlmm-3.3.2/gdl/gdlmm/docklayout.cc 2011-11-23 18:47:10.000000000 +0100
+@@ -165,11 +165,6 @@
+ return Glib::ListHandler<Glib::ustring>::list_to_vector(gdl_dock_layout_get_layouts(gobj(), static_cast<int>(include_default)), Glib::OWNERSHIP_SHALLOW);
+ }
+
+-void DockLayout::run_manager()
+-{
+-gdl_dock_layout_run_manager(gobj());
+-}
+-
+ bool DockLayout::load_from_file(const std::string& filename)
+ {
+ return gdl_dock_layout_load_from_file(gobj(), filename.c_str());
+diff -uNr gdlmm-3.2.1/gdl/gdlmm/docklayout.h gdlmm-3.3.2/gdl/gdlmm/docklayout.h
+--- gdlmm-3.2.1/gdl/gdlmm/docklayout.h 2011-10-17 22:02:12.000000000 +0200
++++ gdlmm-3.3.2/gdl/gdlmm/docklayout.h 2011-11-23 18:47:10.000000000 +0100
+@@ -114,9 +114,6 @@
+ std::vector<Glib::ustring> get_layouts(bool include_default);
+
+
+- void run_manager();
+-
+-
+ bool load_from_file(const std::string& filename);
+
+
+diff -uNr gdlmm-3.2.1/gdl/src/docklayout.hg gdlmm-3.3.2/gdl/src/docklayout.hg
+--- gdlmm-3.2.1/gdl/src/docklayout.hg 2011-10-17 22:01:29.000000000 +0200
++++ gdlmm-3.3.2/gdl/src/docklayout.hg 2011-11-23 18:40:16.000000000 +0100
+@@ -52,8 +52,6 @@
+ #m4 _CONVERSION(`GList*',`std::vector<Glib::ustring>',`Glib::ListHandler<Glib::ustring>::list_to_vector($3, Glib::OWNERSHIP_SHALLOW)')
+ _WRAP_METHOD(std::vector<Glib::ustring> get_layouts(bool include_default), gdl_dock_layout_get_layouts)
+
+- _WRAP_METHOD(void run_manager(), gdl_dock_layout_run_manager)
+-
+ _WRAP_METHOD(bool load_from_file(const std::string& filename), gdl_dock_layout_load_from_file)
+
+ _WRAP_METHOD(bool save_to_file(const std::string& filename), gdl_dock_layout_save_to_file)
+diff -uNr gdlmm-3.2.1/gdl/src/gdl_method.defs gdlmm-3.3.2/gdl/src/gdl_method.defs
+--- gdlmm-3.2.1/gdl/src/gdl_method.defs 2011-10-17 22:01:29.000000000 +0200
++++ gdlmm-3.3.2/gdl/src/gdl_method.defs 2011-11-23 18:40:16.000000000 +0100
+@@ -532,12 +532,6 @@
+ )
+ )
+
+-(define-method run_manager
+- (of-object "GdlDockLayout")
+- (c-name "gdl_dock_layout_run_manager")
+- (return-type "none")
+-)
+-
+ (define-method load_from_file
+ (of-object "GdlDockLayout")
+ (c-name "gdl_dock_layout_load_from_file")
+--- gdlmm-3.3.2/gdl/gdlmm/docklayout.cc.get_layouts_ui 2011-11-23 19:47:10.000000000 +0200
++++ gdlmm-3.3.2/gdl/gdlmm/docklayout.cc 2012-04-23 00:35:26.839494884 +0300
+@@ -180,11 +180,6 @@
+ return gdl_dock_layout_is_dirty(const_cast<GdlDockLayout*>(gobj()));
+ }
+
+-Gtk::Widget* DockLayout::get_layouts_ui()
+-{
+- return Glib::wrap(gdl_dock_layout_get_layouts_ui(gobj()));
+-}
+-
+
+ #ifdef GLIBMM_PROPERTIES_ENABLED
+ Glib::PropertyProxy_ReadOnly<bool> DockLayout::property_dirty() const
+diff --git a/gdl/src/dock.hg b/gdl/src/dock.hg
+index 6637f05..0bbb262 100644
+--- a/gdl/src/dock.hg
++++ b/gdl/src/dock.hg
+@@ -56,7 +56,7 @@ public:
+
+ //_WRAP_METHOD(void xor_rect(GdkRectangle *rect), gdl_dock_xor_rect)
+
+- _WRAP_METHOD(void xor_rect_hide(), gdl_dock_xor_rect_hide)
++ _WRAP_METHOD(void hide_preview(), gdl_dock_hide_preview)
+
+ _WRAP_PROPERTY("default-title", Glib::ustring)
+
+diff --git a/gdl/src/docklayout.hg b/gdl/src/docklayout.hg
+index 155d58b..e45266e 100644
+--- a/gdl/src/docklayout.hg
++++ b/gdl/src/docklayout.hg
+@@ -58,9 +58,6 @@ public:
+
+ _WRAP_METHOD(bool is_dirty() const, gdl_dock_layout_is_dirty)
+
+- _WRAP_METHOD(Gtk::Widget* get_layouts_ui(), gdl_dock_layout_get_layouts_ui)
+-
+-
+ _WRAP_PROPERTY("dirty", bool)
+
+ _WRAP_PROPERTY("master", Glib::RefPtr<DockMaster>)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/gdlmm/gdlmm.spec?r1=1.5&r2=1.6
More information about the pld-cvs-commit
mailing list