rpms/nbtk/devel nbtk-1.2.3-types.patch,NONE,1.1 nbtk.spec,1.39,1.40

Dan Horák sharkcz at fedoraproject.org
Mon Jul 12 15:02:25 UTC 2010


Author: sharkcz

Update of /cvs/pkgs/rpms/nbtk/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30920

Modified Files:
	nbtk.spec 
Added Files:
	nbtk-1.2.3-types.patch 
Log Message:
* Mon Jul 12 2010 Dan Horák <dan[at]danny.cz> 1.2.3-5
- fix implicit types warnings, caused crash on s390(x), patch from Debian


nbtk-1.2.3-types.patch:
 Makefile.am |    2 +-
 nbtk.types  |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE nbtk-1.2.3-types.patch ---
Index: nbtk-1.2.3/docs/reference/libnbtk/Makefile.am
===================================================================
--- nbtk-1.2.3.orig/docs/reference/libnbtk/Makefile.am	2010-04-17 14:16:07.890565869 +0800
+++ nbtk-1.2.3/docs/reference/libnbtk/Makefile.am	2010-04-17 14:18:22.194571038 +0800
@@ -83,7 +83,7 @@
 # signals and properties.
 # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
-GTKDOC_CFLAGS=-I$(NBTK_CFLAGS) -I$(top_srcdir) -I$(top_builddir) -DNBTK_COMPILATION
+GTKDOC_CFLAGS=$(NBTK_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir) -I$(top_builddir) -DNBTK_COMPILATION
 GTKDOC_LIBS=$(NBTK_LIBS) $(top_builddir)/nbtk/libnbtk-$(NBTK_API_VERSION).la $(top_builddir)/nbtk/libnbtk-gtk-$(NBTK_API_VERSION).la
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
Index: nbtk-1.2.3/docs/reference/libnbtk/nbtk.types
===================================================================
--- nbtk-1.2.3.orig/docs/reference/libnbtk/nbtk.types	2010-04-17 14:16:07.890565869 +0800
+++ nbtk-1.2.3/docs/reference/libnbtk/nbtk.types	2010-04-17 14:18:22.194571038 +0800
@@ -1,4 +1,6 @@
 #include <nbtk/nbtk.h>
+#include <nbtk/nbtk-subtexture.h>
+#include <nbtk/nbtk-gtk.h>
 
 nbtk_adjustment_get_type
 nbtk_bin_get_type


Index: nbtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nbtk/devel/nbtk.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- nbtk.spec	12 Jul 2010 14:40:22 -0000	1.39
+++ nbtk.spec	12 Jul 2010 15:02:25 -0000	1.40
@@ -8,6 +8,7 @@ License:        LGPLv2
 URL:            http://moblin.org/projects/netbook-toolkit-nbtk
 Source0:        http://download.moblin.org/sources/%{name}/1.2/%{name}-%{version}.tar.bz2
 Patch0:         %{name}-1.2.3-gtk.patch
+Patch1:         %{name}-1.2.3-types.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: clutter-devel >= 1.0.0
@@ -40,6 +41,7 @@ Files for development with %{name}.
 %prep
 %setup -q
 %patch0 -p1 -b .gtk
+%patch1 -p1 -b .types
 
 %build
 %configure --enable-gtk-doc --disable-static
@@ -78,6 +80,9 @@ rm -rf %{buildroot}
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Mon Jul 12 2010 Dan Horák <dan[at]danny.cz> 1.2.3-5
+- fix implicit types warnings, caused crash on s390(x), patch from Debian
+
 * Mon Jul 12 2010 Dan Horák <dan[at]danny.cz> 1.2.3-4
 - drop BR: gir-repository-devel
 - fix FTBFS #599883 (patch from Debian, further updated)



More information about the scm-commits mailing list