From 3d08d63e3e533703c928a7b2fed1acd772102570ada76c51c3115d00430dcfb6 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 22 Nov 2010 11:44:02 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/xorg-x11-libs revision 93.0 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-libs?expand=0&rev=7a4eea7e1af5b7a4a451868ac3678a34 --- xorg-x11-libs.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xorg-x11-libs.spec b/xorg-x11-libs.spec index 1587441..aa35fd2 100644 --- a/xorg-x11-libs.spec +++ b/xorg-x11-libs.spec @@ -34,7 +34,7 @@ Obsoletes: xorg-x11-libs-64bit # Url: http://xorg.freedesktop.org/ Version: 7.5 -Release: 11 +Release: 12 License: GPLv2+ ; MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/Libraries From 1f50420e58d69118f561f7cb544266db1a1c0fae2380b37a21dbe2573e929d68 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 30 Nov 2010 19:31:19 +0000 Subject: [PATCH 2/2] Accepting request 54201 from home:elvigia:branches:X11:XOrg reviewed ok. OBS-URL: https://build.opensuse.org/request/show/54201 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-libs?expand=0&rev=153 --- xorg-x11-libs-export-symbols.patch | 279 +++++++++++++++++++++++++++++ xorg-x11-libs.changes | 6 + xorg-x11-libs.spec | 6 +- 3 files changed, 289 insertions(+), 2 deletions(-) create mode 100644 xorg-x11-libs-export-symbols.patch diff --git a/xorg-x11-libs-export-symbols.patch b/xorg-x11-libs-export-symbols.patch new file mode 100644 index 0000000..7c64992 --- /dev/null +++ b/xorg-x11-libs-export-symbols.patch @@ -0,0 +1,279 @@ +--- libFS-1.0.3/src/Makefile.am.orig ++++ libFS-1.0.3/src/Makefile.am +@@ -35,7 +35,7 @@ libFS_la_LIBADD = $(FS_LIBS) $(XTRANS_LI + + INCLUDES = -I$(top_srcdir)/include/X11/fonts + +-libFS_la_LDFLAGS = -version-number 6:0:0 -no-undefined ++libFS_la_LDFLAGS = -export-symbols-regex "^[^_].*" -version-number 6:0:0 -no-undefined + + libFSincludedir = $(includedir)/X11/fonts + libFSinclude_HEADERS = \ +--- libXaw-1.0.8/src/Makefile.am.orig ++++ libXaw-1.0.8/src/Makefile.am +@@ -73,7 +73,7 @@ libXaw6_la_CFLAGS = \ + libXaw6_la_SOURCES = \ + $(COMMON_SOURCES) + +-libXaw6_la_LDFLAGS = -version-info 6:1:0 -no-undefined ++libXaw6_la_LDFLAGS = -export-symbols-regex "^[^_].*" -version-info 6:1:0 -no-undefined + libXaw6_la_LIBADD = $(XAW6_LIBS) + + if !PLATFORM_WIN32 +@@ -109,7 +109,7 @@ libXaw7_la_SOURCES = \ + $(COMMON_SOURCES) \ + Tip.c + +-libXaw7_la_LDFLAGS = -version-info 7:0:0 -no-undefined ++libXaw7_la_LDFLAGS = -export-symbols-regex "^[^_].*" -version-info 7:0:0 -no-undefined + libXaw7_la_LIBADD = $(XAW7_LIBS) + + if !PLATFORM_WIN32 +--- libXcomposite-0.4.3/src/Makefile.am.orig ++++ libXcomposite-0.4.3/src/Makefile.am +@@ -30,7 +30,7 @@ libXcomposite_la_SOURCES = \ + + libXcomposite_la_LIBADD = $(XCOMPOSITE_LIBS) + +-libXcomposite_la_LDFLAGS = -version-number 1:0:0 -no-undefined ++libXcomposite_la_LDFLAGS = -export-symbols-regex "^[^_].*" -version-number 1:0:0 -no-undefined + + libXcompositeincludedir = $(includedir)/X11/extensions + libXcompositeinclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xcomposite.h +--- libXfont-1.4.3/src/Makefile.am.orig ++++ libXfont-1.4.3/src/Makefile.am +@@ -65,4 +65,4 @@ libXfont_la_LIBADD = \ + + libXfont_la_SOURCES = dummy.c + +-libXfont_la_LDFLAGS = -version-number 1:4:1 ++libXfont_la_LDFLAGS = -export-symbols-regex "^[^_].*" -version-number 1:4:1 +--- libXrandr-1.3.1/src/Makefile.am.orig ++++ libXrandr-1.3.1/src/Makefile.am +@@ -19,7 +19,7 @@ AM_CFLAGS = \ + + INCLUDES = -I$(top_srcdir)/include/X11/extensions + +-libXrandr_la_LDFLAGS = -version-number 2:2:0 -no-undefined ++libXrandr_la_LDFLAGS = -export-symbols-regex "^[^_].*" -version-number 2:2:0 -no-undefined + + libXrandrincludedir = $(includedir)/X11/extensions + libXrandrinclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xrandr.h +--- libXinerama-1.1.1/src/Makefile.am.orig ++++ libXinerama-1.1.1/src/Makefile.am +@@ -12,7 +12,7 @@ libXinerama_la_SOURCES = \ + + libXinerama_la_LIBADD = $(XINERAMA_LIBS) + +-libXinerama_la_LDFLAGS = -version-number 1:0:0 -no-undefined ++libXinerama_la_LDFLAGS = -export-symbols-regex "^[^_].*" -version-number 1:0:0 -no-undefined + + libXineramaincludedir = $(includedir)/X11/extensions + libXineramainclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xinerama.h \ +--- libXres-1.0.5/src/Makefile.am.orig ++++ libXres-1.0.5/src/Makefile.am +@@ -12,7 +12,7 @@ AM_CFLAGS = \ + + INCLUDES = -I$(top_srcdir)/include + +-libXRes_la_LDFLAGS = -version-number 1:0:0 -no-undefined ++libXRes_la_LDFLAGS = -export-symbols-regex "^[^_].*" -version-number 1:0:0 -no-undefined + + libXResincludedir = $(includedir)/X11/extensions + libXResinclude_HEADERS = $(top_srcdir)/include/X11/extensions/XRes.h +--- libXtst-1.2.0/src/Makefile.am.orig ++++ libXtst-1.2.0/src/Makefile.am +@@ -12,7 +12,7 @@ AM_CFLAGS = \ + $(XTST_CFLAGS) \ + $(CWARNFLAGS) + +-libXtst_la_LDFLAGS = -version-number 6:1:0 -no-undefined ++libXtst_la_LDFLAGS = -export-symbols-regex "^[^_].*" -version-number 6:1:0 -no-undefined + + libXtstincludedir = $(includedir)/X11/extensions + libXtstinclude_HEADERS = $(top_srcdir)/include/X11/extensions/XTest.h \ +--- libXvMC-1.0.6/src/Makefile.am.orig ++++ libXvMC-1.0.6/src/Makefile.am +@@ -20,8 +20,8 @@ libXvMCW_la_CFLAGS = \ + -DXVMC_SOVERSION=\".1.0\" \ + -DXV_SOVERSION=\".1.0\" + +-libXvMC_la_LDFLAGS = -version-number 1:0:0 -no-undefined +-libXvMCW_la_LDFLAGS = -version-number 1:0:0 -no-undefined ++libXvMC_la_LDFLAGS = -export-symbols-regex "^[^_].*" -version-number 1:0:0 -no-undefined ++libXvMCW_la_LDFLAGS = -export-symbols-regex "^[^_].*" -version-number 1:0:0 -no-undefined + + + if LINT +--- libXxf86misc-1.0.3/src/Makefile.am.orig ++++ libXxf86misc-1.0.3/src/Makefile.am +@@ -4,4 +4,4 @@ libXxf86misc_la_SOURCES = XF86Misc.c + + AM_CFLAGS = $(CWARNFLAGS) $(XXF86MISC_CFLAGS) $(MALLOC_ZERO_CFLAGS) + libXxf86misc_la_LIBADD = $(XXF86MISC_LIBS) +-libXxf86misc_la_LDFLAGS = -version-number 1:1:0 ++libXxf86misc_la_LDFLAGS = -export-symbols-regex "^[^_].*" -version-number 1:1:0 +--- libXxf86vm-1.1.1/src/Makefile.am.orig ++++ libXxf86vm-1.1.1/src/Makefile.am +@@ -4,7 +4,7 @@ libXxf86vm_la_SOURCES = XF86VMode.c + + AM_CFLAGS = $(XXF86VM_CFLAGS) $(MALLOC_ZERO_CFLAGS) + libXxf86vm_la_LIBADD = $(XXF86VM_LIBS) +-libXxf86vm_la_LDFLAGS = -version-number 1:0:0 ++libXxf86vm_la_LDFLAGS = -export-symbols-regex "^[^_].*" -version-number 1:0:0 + + INCLUDES = -I$(top_srcdir)/include + +--- libvnc/src/Makefile.am.orig ++++ libvnc/src/Makefile.am +@@ -5,6 +5,6 @@ libVncExt_la_SOURCES = \ + + libVncExt_la_LIBADD = $(VNCEXT_LIBS) + +-libVncExt_la_LDFLAGS = -version-number 2:0:0 -no-undefined ++libVncExt_la_LDFLAGS = -export-symbols-regex "^[^_].*" -version-number 2:0:0 -no-undefined + + AM_CFLAGS = $(VNCEXT_CFLAGS) $(MALLOC_ZERO_CFLAGS) +--- libdmx-1.1.1/src/Makefile.am.orig ++++ libdmx-1.1.1/src/Makefile.am +@@ -5,7 +5,7 @@ libdmx_la_SOURCES = \ + + libdmx_la_LIBADD = $(DMX_LIBS) + +-libdmx_la_LDFLAGS = -version-number 1:0:0 -no-undefined ++libdmx_la_LDFLAGS = -export-symbols-regex "^[^_].*" -version-number 1:0:0 -no-undefined + + AM_CFLAGS = -I$(top_srcdir)/include \ + -I$(top_srcdir)/include/X11 \ +--- libXcursor-1.1.11/src/Makefile.am.orig ++++ libXcursor-1.1.11/src/Makefile.am +@@ -17,7 +17,7 @@ INCLUDES = -I$(top_srcdir)/include/X11/X + # + # Shared library version info. This is not the same as the package version + # +-libXcursor_la_LDFLAGS = -version-number 1:0:2 -no-undefined ++libXcursor_la_LDFLAGS = -export-symbols-regex "^[^_].*" -version-number 1:0:2 -no-undefined + + libXcursorincludedir = $(includedir)/X11/Xcursor + libXcursorinclude_HEADERS = $(top_srcdir)/include/X11/Xcursor/Xcursor.h +--- libpciaccess-0.12.0/src/Makefile.am.orig ++++ libpciaccess-0.12.0/src/Makefile.am +@@ -71,7 +71,7 @@ INCLUDES = -I$(top_srcdir)/include + + libpciaccess_la_LIBADD = $(PCIACCESS_LIBS) + +-libpciaccess_la_LDFLAGS = -version-number 0:10:8 -no-undefined ++libpciaccess_la_LDFLAGS = -export-symbols-regex "^[^_].*" -version-number 0:10:8 -no-undefined + + libpciaccessincludedir = $(includedir) + libpciaccessinclude_HEADERS = \ +--- libXfontcache-1.0.5/src/Makefile.am.orig ++++ libXfontcache-1.0.5/src/Makefile.am +@@ -6,4 +6,4 @@ libXfontcache_la_SOURCES = \ + + libXfontcache_la_LIBADD = $(XFONTCACHE_LIBS) + +-libXfontcache_la_LDFLAGS = -version-number 1:0:0 -no-undefined ++libXfontcache_la_LDFLAGS = -export-symbols-regex "^[^_].*" -version-number 1:0:0 -no-undefined +--- libXft-2.2.0/src/Makefile.am.orig ++++ libXft-2.2.0/src/Makefile.am +@@ -24,7 +24,7 @@ libXft_la_SOURCES = xftint.h \ + libXft_la_LIBADD = @FONTCONFIG_LIBS@ @FREETYPE_LIBS@ @XRENDER_LIBS@ + + # -version-number requires libtool >= 1.5 +-libXft_la_LDFLAGS = -version-number $(XFT_LT_VERSION) -no-undefined ++libXft_la_LDFLAGS = -export-symbols-regex "^[^_].*" -version-number $(XFT_LT_VERSION) -no-undefined + + libXftincludedir = $(includedir)/X11/Xft + libXftinclude_HEADERS = \ +--- libxkbui-X11R7.1-1.0.2/src/Makefile.am.orig ++++ libxkbui-X11R7.1-1.0.2/src/Makefile.am +@@ -10,7 +10,7 @@ AM_CFLAGS = @XKBUI_CFLAGS@ + + libxkbui_la_LIBADD = @XKBUI_LIBS@ + +-libxkbui_la_LDFLAGS = -version-number 1:0:0 -no-undefined ++libxkbui_la_LDFLAGS = -export-symbols-regex "^[^_].*" -version-number 1:0:0 -no-undefined + + libxkbuiincludedir = $(includedir)/X11/extensions + libxkbuiinclude_HEADERS = \ +--- libXprintAppUtil-X11R7.0-1.0.1/src/Makefile.am.orig ++++ libXprintAppUtil-X11R7.0-1.0.1/src/Makefile.am +@@ -9,7 +9,7 @@ INCLUDES = -I$(top_srcdir)/include + libXprintAppUtil_la_LIBADD = @XPRINTAPPUTIL_LIBS@ + AM_CFLAGS = @XPRINTAPPUTIL_CFLAGS@ + +-libXprintAppUtil_la_LDFLAGS = -version-number 1:0:0 -no-undefined ++libXprintAppUtil_la_LDFLAGS = -export-symbols-regex "^[^_].*" -version-number 1:0:0 -no-undefined + + + libXprintAppUtilincludedir = $(includedir)/X11/XprintAppUtil +--- libXScrnSaver-1.2.1/src/Makefile.am.orig ++++ libXScrnSaver-1.2.1/src/Makefile.am +@@ -12,7 +12,7 @@ libXss_la_SOURCES = \ + + libXss_la_LIBADD = $(XSCRNSAVER_LIBS) + +-libXss_la_LDFLAGS = -version-info 1:0:0 -no-undefined ++libXss_la_LDFLAGS = -export-symbols-regex "^[^_].*" -version-info 1:0:0 -no-undefined + + libXScrnSaverincludedir = $(includedir)/X11/extensions + libXScrnSaverinclude_HEADERS = $(top_srcdir)/include/X11/extensions/scrnsaver.h +--- libXTrap-X11R7.0-1.0.0/src/Makefile.am.orig ++++ libXTrap-X11R7.0-1.0.0/src/Makefile.am +@@ -14,4 +14,4 @@ AM_CFLAGS = @XTRAP_CFLAGS@ + + libXTrap_la_LIBADD = @XTRAP_LIBS@ + +-libXTrap_la_LDFLAGS = -version-number 6:4:0 -no-undefined ++libXTrap_la_LDFLAGS = -export-symbols-regex "^[^_].*" -version-number 6:4:0 -no-undefined +--- libXcliplist/src/Makefile.am.orig ++++ libXcliplist/src/Makefile.am +@@ -5,6 +5,6 @@ libXcliplist_la_SOURCES = \ + + libXcliplist_la_LIBADD = $(XCLIPLIST_LIBS) + +-libXcliplist_la_LDFLAGS = -version-number 1:0:0 -no-undefined ++libXcliplist_la_LDFLAGS = -export-symbols-regex "^[^_].*" -version-number 1:0:0 -no-undefined + + AM_CFLAGS = $(XCLIPLIST_CFLAGS) $(MALLOC_ZERO_CFLAGS) +--- liboldX-X11R7.0-1.0.1/src/Makefile.am.orig ++++ liboldX-X11R7.0-1.0.1/src/Makefile.am +@@ -14,7 +14,7 @@ INCLUDES = -I$(top_srcdir)/include/X11 + liboldX_la_LIBADD = @OLDX_LIBS@ + AM_CFLAGS = @OLDX_CFLAGS@ @MALLOC_ZERO_CFLAGS@ + +-liboldX_la_LDFLAGS = -version-number 6:0:0 -no-undefined ++liboldX_la_LDFLAGS = -export-symbols-regex "^[^_].*" -version-number 6:0:0 -no-undefined + + liboldXincludedir = $(includedir)/X11 + liboldXinclude_HEADERS = \ +--- liblbxutil-1.1.0/src/Makefile.am.orig ++++ liblbxutil-1.1.0/src/Makefile.am +@@ -42,6 +42,6 @@ g3states.h: mkg3states + -rm -f g3states.h + $(AM_V_GEN) ./mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h + +-liblbxutil_la_LDFLAGS = -version-number 1:0:0 -no-undefined ++liblbxutil_la_LDFLAGS = -export-symbols-regex "^[^_].*" -version-number 1:0:0 -no-undefined + + CLEANFILES = g3states.h +--- libWindowsWM-1.0.1/src/Makefile.am.orig ++++ libWindowsWM-1.0.1/src/Makefile.am +@@ -6,4 +6,4 @@ libWindowsWM_la_SOURCES = \ + AM_CFLAGS = $(CWARNFLAGS) @WINDOWSWM_CFLAGS@ @MALLOC_ZERO_CFLAGS@ + libWindowsWM_la_LIBADD = @WINDOWSWM_LIBS@ + +-libWindowsWM_la_LDFLAGS = -version-info 7:0:0 -no-undefined ++libWindowsWM_la_LDFLAGS = -export-symbols-regex "^[^_].*" -version-info 7:0:0 -no-undefined +--- libXxf86dga-1.1.2/src/Makefile.am.orig ++++ libXxf86dga-1.1.2/src/Makefile.am +@@ -8,7 +8,7 @@ AM_CFLAGS = -I $(top_srcdir)/include \ + $(CWARNFLAGS) + + libXxf86dga_la_LIBADD = $(XXF86DGA_LIBS) +-libXxf86dga_la_LDFLAGS = -version-number 1:0:0 ++libXxf86dga_la_LDFLAGS = -export-symbols-regex "^[^_].*" -version-number 1:0:0 + + libXxf86dgaincludedir = $(includedir)/X11/extensions + libXxf86dgainclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xxf86dga.h \ diff --git a/xorg-x11-libs.changes b/xorg-x11-libs.changes index c53d643..e6fc3b6 100644 --- a/xorg-x11-libs.changes +++ b/xorg-x11-libs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Nov 30 18:28:47 UTC 2010 - cristian.rodriguez@opensuse.org + +- export only public API symbols +- disable silent rules, defeat the purpose of post build checks + ------------------------------------------------------------------- Sun Nov 21 23:35:35 UTC 2010 - sndirsch@novell.com diff --git a/xorg-x11-libs.spec b/xorg-x11-libs.spec index aa35fd2..1d5f34e 100644 --- a/xorg-x11-libs.spec +++ b/xorg-x11-libs.spec @@ -74,7 +74,7 @@ Patch2: libXft-2.1.7-lcd-filter-2.patch Patch5: libxkbui.diff Patch10: libXxf86misc-xcb.diff Patch21: libXTrap-pcfix.diff - +Patch22: xorg-x11-libs-export-symbols.patch %description This package contains the remaining X.Org libraries. @@ -218,6 +218,7 @@ Authors: %prep %setup -q -T -c %{name} for i in $RPM_SOURCE_DIR/*.tar.bz2; do tar xjf $i; done +%patch22 pushd libXft-*/src %patch2 -p1 popd @@ -240,8 +241,9 @@ for dir in $(ls); do libpciaccess-*) option="--with-pciids-path=/usr/share/" ;; *) ;; esac + autoreconf -fiv export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" - %configure \ + %configure --disable-silent-rules \ --disable-static \ --with-pic --enable-type1 ${option} %{__make} %{?jobs:-j%jobs}