rpms/codeblocks/devel codeblocks-8.02-dso.patch, NONE, 1.1 codeblocks.spec, 1.34, 1.35

[Dan Horák]

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7690

Modified Files:
	codeblocks.spec 
Added Files:
	codeblocks-8.02-dso.patch 
Log Message:
* Sat Feb 13 2010 Dan Horák <dan[at]danny.cz> - 8.02-10
- fixed linking with the new --no-add-needed default (#564644)


codeblocks-8.02-dso.patch:
 Makefile.am           |    2 +-
 Makefile.in           |    2 +-
 resources/Makefile.am |    2 +-
 resources/Makefile.in |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE codeblocks-8.02-dso.patch ---
diff -up codeblocks-8.02/src/plugins/contrib/codesnippets/Makefile.am.dso codeblocks-8.02/src/plugins/contrib/codesnippets/Makefile.am
--- codeblocks-8.02/src/plugins/contrib/codesnippets/Makefile.am.dso	2010-02-13 23:15:49.000000000 +0100
+++ codeblocks-8.02/src/plugins/contrib/codesnippets/Makefile.am	2010-02-13 23:15:49.000000000 +0100
@@ -11,7 +11,7 @@ libdir = @libdir@/@PACKAGE@/plugins
 
 lib_LTLIBRARIES = libcodesnippets.la
 
-libcodesnippets_la_LDFLAGS = $(WX_GTK2_LIBS) -module -version-info 0:1:0 -shared -no-undefined -avoid-version
+libcodesnippets_la_LDFLAGS = $(WX_GTK2_LIBS) -lX11 -module -version-info 0:1:0 -shared -no-undefined -avoid-version
 
 libcodesnippets_la_LIBADD = $(PLUGIN_WX_LIBS) ../../../sdk/libcodeblocks.la
 
diff -up codeblocks-8.02/src/plugins/contrib/codesnippets/Makefile.in.dso codeblocks-8.02/src/plugins/contrib/codesnippets/Makefile.in
--- codeblocks-8.02/src/plugins/contrib/codesnippets/Makefile.in.dso	2010-02-13 23:15:49.000000000 +0100
+++ codeblocks-8.02/src/plugins/contrib/codesnippets/Makefile.in	2010-02-13 23:15:49.000000000 +0100
@@ -267,7 +267,7 @@ INCLUDES = $(WX_CXXFLAGS) \
         -DBUILDING_PLUGIN
 
 lib_LTLIBRARIES = libcodesnippets.la
-libcodesnippets_la_LDFLAGS = $(WX_GTK2_LIBS) -module -version-info 0:1:0 -shared -no-undefined -avoid-version
+libcodesnippets_la_LDFLAGS = $(WX_GTK2_LIBS) -lX11 -module -version-info 0:1:0 -shared -no-undefined -avoid-version
 libcodesnippets_la_LIBADD = $(PLUGIN_WX_LIBS) ../../../sdk/libcodeblocks.la
 libcodesnippets_la_SOURCES = codesnippets.cpp \
 			codesnippetstreectrl.cpp \
diff -up codeblocks-8.02/src/plugins/contrib/codesnippets/resources/Makefile.am.dso codeblocks-8.02/src/plugins/contrib/codesnippets/resources/Makefile.am
--- codeblocks-8.02/src/plugins/contrib/codesnippets/resources/Makefile.am.dso	2010-02-13 23:33:07.000000000 +0100
+++ codeblocks-8.02/src/plugins/contrib/codesnippets/resources/Makefile.am	2010-02-13 23:33:22.000000000 +0100
@@ -16,7 +16,7 @@ codesnippets_LDFLAGS = $(WX_GTK2_LIBS)
 ##codesnippets_LDADD = $(PLUGIN_WX_LIBS) ../../../../sdk/libcodeblocks.la
 codesnippets_LDADD =  -L../../../../base/tinyxml -ltinyxml \
             -L../../../../sdk/wxscintilla -lwxscintilla \
-			$(PLUGIN_WX_LIBS) $(WX_LIBS)
+			$(PLUGIN_WX_LIBS) $(WX_LIBS) -lX11
 
 codesnippets_SOURCES = 	../codesnippetsapp.cpp \
 			../codesnippetstreectrl.cpp \
diff -up codeblocks-8.02/src/plugins/contrib/codesnippets/resources/Makefile.in.dso codeblocks-8.02/src/plugins/contrib/codesnippets/resources/Makefile.in
--- codeblocks-8.02/src/plugins/contrib/codesnippets/resources/Makefile.in.dso	2010-02-13 23:33:11.000000000 +0100
+++ codeblocks-8.02/src/plugins/contrib/codesnippets/resources/Makefile.in	2010-02-13 23:33:35.000000000 +0100
@@ -260,7 +260,7 @@ INCLUDES = $(WX_CXXFLAGS) \
 codesnippets_LDFLAGS = $(WX_GTK2_LIBS)
 codesnippets_LDADD = -L../../../../base/tinyxml -ltinyxml \
             -L../../../../sdk/wxscintilla -lwxscintilla \
-			$(PLUGIN_WX_LIBS) $(WX_LIBS)
+			$(PLUGIN_WX_LIBS) $(WX_LIBS) -lX11
 
 codesnippets_SOURCES = ../codesnippetsapp.cpp \
 			../codesnippetstreectrl.cpp \


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/codeblocks.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- codeblocks.spec	24 Jul 2009 19:13:10 -0000	1.34
+++ codeblocks.spec	13 Feb 2010 22:50:06 -0000	1.35
@@ -1,6 +1,6 @@
 Name:		codeblocks
 Version:	8.02
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPLv3+
@@ -25,6 +25,8 @@ Patch4:         codeblocks-8.02-gcc-dete
 Patch5:         codeblocks-drop-const.patch
 # fix GSocket conflict between glib >= 2.21 and wxGTK
 Patch6:         codeblocks-8.02-gsocket.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=565198
+Patch7:         codeblocks-8.02-dso.patch
 
 
 %description
@@ -81,6 +83,7 @@ Additional Code::Blocks plugins.
 %patch4 -p0 -b .gcc-detect
 %patch5 -p1 -b .gcc44
 %patch6 -p1 -b .gsocket
+%patch7 -p1 -b .dso
 
 # convert EOLs
 find . -type f -and -not -name "*.cpp" -and -not -name "*.h" -and -not -name "*.png" -and -not -name "*.bmp" -and -not -name "*.c" -and -not -name "*.cxx" -and -not -name "*.ico" | sed "s/.*/\"\\0\"/" | xargs dos2unix --keepdate &> /dev/null
@@ -267,6 +270,9 @@ update-mime-database /usr/share/mime &> 
 
 
 %changelog
+* Sat Feb 13 2010 Dan Horák <dan[at]danny.cz> - 8.02-10
+- fixed linking with the new --no-add-needed default (#564644)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8.02-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild