r32811 - in /desktop/experimental/gtk+3.0/debian: ./ patches/
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Wed Mar 7 00:06:00 UTC 2012
Author: biebl
Date: Wed Mar 7 00:05:59 2012
New Revision: 32811
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=32811
Log:
Stop building static libraries which require a full separate build and
appear to be unused.
Removed:
desktop/experimental/gtk+3.0/debian/patches/001_static-linking-dont-query-immodules.patch
Modified:
desktop/experimental/gtk+3.0/debian/README.Debian
desktop/experimental/gtk+3.0/debian/changelog
desktop/experimental/gtk+3.0/debian/control
desktop/experimental/gtk+3.0/debian/control.in
desktop/experimental/gtk+3.0/debian/gtk-3-examples.install.in
desktop/experimental/gtk+3.0/debian/libgail-3-dev.install.in
desktop/experimental/gtk+3.0/debian/libgtk-3-0-udeb.install.in
desktop/experimental/gtk+3.0/debian/libgtk-3-0.install.in
desktop/experimental/gtk+3.0/debian/libgtk-3-bin.install.in
desktop/experimental/gtk+3.0/debian/libgtk-3-common.install.in
desktop/experimental/gtk+3.0/debian/libgtk-3-dev.install.in
desktop/experimental/gtk+3.0/debian/libgtk-3-doc.install.in
desktop/experimental/gtk+3.0/debian/patches/series
desktop/experimental/gtk+3.0/debian/rules
Modified: desktop/experimental/gtk+3.0/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/README.Debian?rev=32811&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/README.Debian [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/README.Debian [utf-8] Wed Mar 7 00:05:59 2012
@@ -1,26 +1,5 @@
GTK+2.0 for Debian
-------------------
-
-Static libraries issue
-======================
-If you wish to link the GTK+ 2.0 libraries statically into your program,
-please note that you *can not* use the '-static' flag to gcc.
-Instead, you have to link your program *dynamically* and link *only*
-the GTK+ 2.0 libraries statically, like this:
-
-$ gcc -export-dynamic -o foo foo.c \
- -Wl,-Bstatic `pkg-config --cflags --libs gtk+-2.0` -Wl,-Bdynamic \
- [other dynamically linked libraries]
-
-The reason for this is that GTK+ 2.0 uses dlopen(3) in order to load
-some modules. Undefined symbols in these modules are resolved by the
-dynamic linker. If the program is linked statically, the linker has
-no way of finding out which symbols are already present in the program
-and might causes strange problem so that proper symbols isn't used --
-Initialize function in statically linked libraries is called, and some
-global variable is initialized, dynamically loaded modules might also
-expects those initialized global variable.
-
Key binding
===========
Modified: desktop/experimental/gtk+3.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/changelog?rev=32811&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/changelog [utf-8] Wed Mar 7 00:05:59 2012
@@ -23,8 +23,10 @@
- Refresh remaining patches.
* debian/gtk-3-examples.install.in: Install gtk3-widget-factory demo
application.
-
- -- Michael Biebl <biebl at debian.org> Tue, 06 Mar 2012 09:02:27 +0100
+ * Stop building static libraries which require a full separate build and
+ appear to be unused.
+
+ -- Michael Biebl <biebl at debian.org> Wed, 07 Mar 2012 00:59:24 +0100
gtk+3.0 (3.2.3-1) unstable; urgency=low
Modified: desktop/experimental/gtk+3.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/control?rev=32811&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/control [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/control [utf-8] Wed Mar 7 00:05:59 2012
@@ -164,8 +164,8 @@
for projects ranging from small one-off tools to complete application
suites.
.
- This package contains the header files and static libraries which are
- needed for developing GTK+ applications.
+ This package contains the header and development files which are
+ needed for building GTK+ applications.
Package: libgtk-3-0-dbg
Section: debug
Modified: desktop/experimental/gtk+3.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/control.in?rev=32811&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/control.in [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/control.in [utf-8] Wed Mar 7 00:05:59 2012
@@ -164,8 +164,8 @@
for projects ranging from small one-off tools to complete application
suites.
.
- This package contains the header files and static libraries which are
- needed for developing GTK+ applications.
+ This package contains the header and development files which are
+ needed for building GTK+ applications.
Package: @DEBUG_PKG@
Section: debug
Modified: desktop/experimental/gtk+3.0/debian/gtk-3-examples.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/gtk-3-examples.install.in?rev=32811&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/gtk-3-examples.install.in [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/gtk-3-examples.install.in [utf-8] Wed Mar 7 00:05:59 2012
@@ -1,4 +1,3 @@
-# from the shared flavor
debian/install/shared/usr/bin/gtk3-demo usr/bin
debian/install/shared/usr/bin/gtk3-widget-factory usr/bin
debian/install/shared/usr/share/gtk-3.0/demo usr/share/gtk-3.0
Modified: desktop/experimental/gtk+3.0/debian/libgail-3-dev.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/libgail-3-dev.install.in?rev=32811&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/libgail-3-dev.install.in [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/libgail-3-dev.install.in [utf-8] Wed Mar 7 00:05:59 2012
@@ -1,4 +1,3 @@
debian/install/shared/usr/include/gail* /usr/include
debian/install/shared/@LIBDIR@/libgail*.so @LIBDIR@
-debian/install/static/@LIBDIR@/libgail*.a @LIBDIR@
debian/install/shared/@LIBDIR@/pkgconfig/gail*.pc @LIBDIR@/pkgconfig
Modified: desktop/experimental/gtk+3.0/debian/libgtk-3-0-udeb.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/libgtk-3-0-udeb.install.in?rev=32811&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/libgtk-3-0-udeb.install.in [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/libgtk-3-0-udeb.install.in [utf-8] Wed Mar 7 00:05:59 2012
@@ -1,2 +1,1 @@
-# from the shared flavor
debian/install/shared_udeb/@LIBDIR@/libg?k*.so.* @LIBDIR@
Modified: desktop/experimental/gtk+3.0/debian/libgtk-3-0.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/libgtk-3-0.install.in?rev=32811&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/libgtk-3-0.install.in [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/libgtk-3-0.install.in [utf-8] Wed Mar 7 00:05:59 2012
@@ -1,4 +1,3 @@
-# from the shared flavor
debian/install/shared/usr/bin/gtk-query-immodules-3.0 @LIBDIR@/@SHARED_PKG@
debian/install/shared/usr/bin/gtk-update-icon-cache @LIBDIR@/@SHARED_PKG@
debian/install/shared/@MODULES_BASE_PATH@/immodules/*.so @MODULES_BASE_PATH@/immodules
Modified: desktop/experimental/gtk+3.0/debian/libgtk-3-bin.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/libgtk-3-bin.install.in?rev=32811&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/libgtk-3-bin.install.in [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/libgtk-3-bin.install.in [utf-8] Wed Mar 7 00:05:59 2012
@@ -1,4 +1,3 @@
-# from the shared flavor
docs/reference/gtk/gtk-update-icon-cache.1 usr/share/man/man1
docs/reference/gtk/gtk-query-immodules-3.0.1 usr/share/man/man1
debian/update-icon-caches usr/sbin
Modified: desktop/experimental/gtk+3.0/debian/libgtk-3-common.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/libgtk-3-common.install.in?rev=32811&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/libgtk-3-common.install.in [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/libgtk-3-common.install.in [utf-8] Wed Mar 7 00:05:59 2012
@@ -1,4 +1,3 @@
-# from the shared flavor
debian/install/shared/@CONFDIR@/im-multipress.conf @CONFDIR@
debian/install/shared/usr/share/locale usr/share
debian/install/shared/usr/share/themes usr/share
Modified: desktop/experimental/gtk+3.0/debian/libgtk-3-dev.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/libgtk-3-dev.install.in?rev=32811&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/libgtk-3-dev.install.in [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/libgtk-3-dev.install.in [utf-8] Wed Mar 7 00:05:59 2012
@@ -1,8 +1,5 @@
-# from the shared flavor
debian/install/shared/usr/include/gtk* usr/include
debian/install/shared/@LIBDIR@/libg?k*.so @LIBDIR@
debian/install/shared/@LIBDIR@/pkgconfig/g?k* @LIBDIR@/pkgconfig
debian/install/shared/usr/share/aclocal usr/share
debian/install/shared/usr/share/gir-1.0 usr/share
-# from the static flavor
-debian/install/static/@LIBDIR@/libg?k*.a @LIBDIR@
Modified: desktop/experimental/gtk+3.0/debian/libgtk-3-doc.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/libgtk-3-doc.install.in?rev=32811&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/libgtk-3-doc.install.in [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/libgtk-3-doc.install.in [utf-8] Wed Mar 7 00:05:59 2012
@@ -1,4 +1,3 @@
-# from the shared flavor
debian/install/shared/usr/share/gtk-doc/html/gtk* usr/share/doc/@DOC_PKG@
debian/install/shared/usr/share/gtk-doc/html/gdk* usr/share/doc/@DOC_PKG@
# from the source
Modified: desktop/experimental/gtk+3.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/series?rev=32811&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/patches/series [utf-8] Wed Mar 7 00:05:59 2012
@@ -1,4 +1,3 @@
-001_static-linking-dont-query-immodules.patch
015_default-fallback-icon-theme.patch
016_no_offscreen_widgets_grabbing.patch
017_no_offscreen_device_grabbing.patch
Modified: desktop/experimental/gtk+3.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/rules?rev=32811&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/rules [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/rules [utf-8] Wed Mar 7 00:05:59 2012
@@ -2,7 +2,7 @@
DEB_BUILDDIR = debian/build
DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/install/@FLAVOR@
-DEB_MAKE_FLAVORS = shared shared_udeb static
+DEB_MAKE_FLAVORS = shared shared_udeb
DISABLE_UPDATE_UPLOADERS = 1
include /usr/share/cdbs/1/rules/autoreconf.mk
@@ -69,13 +69,6 @@
--disable-xfixes \
--disable-xrandr
-DEB_CONFIGURE_FLAGS_static = \
- --with-included-loaders=yes \
- --enable-introspection=no \
- --disable-modules \
- --disable-shared \
- --enable-static
-
DEB_MAKE_CHECK_TARGET = -k check || true
DEB_INSTALL_DOCS_ALL = AUTHORS
DEB_INSTALL_DOCS_$(COMMON_PKG) = README NEWS
More information about the pkg-gnome-commits
mailing list