[csw-devel] SF.net SVN: gar:[20566] csw/mgar/pkg/qt4-gcc/trunk
cgrzemba at users.sourceforge.net
cgrzemba at users.sourceforge.net
Tue Apr 2 13:49:30 CEST 2013
Revision: 20566
http://gar.svn.sourceforge.net/gar/?rev=20566&view=rev
Author: cgrzemba
Date: 2013-04-02 11:49:29 +0000 (Tue, 02 Apr 2013)
Log Message:
-----------
qt4-gcc/trunk: fix ShapeInput patch
Modified Paths:
--------------
csw/mgar/pkg/qt4-gcc/trunk/Makefile
csw/mgar/pkg/qt4-gcc/trunk/files/0001-shapeinput.patch
Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-04-02 06:54:56 UTC (rev 20565)
+++ csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-04-02 11:49:29 UTC (rev 20566)
@@ -10,7 +10,6 @@
development and internationalization.
endef
-prefix = $(BUILD_PREFIX)/gxx
GARCOMPILER = GNU
MASTER_SITES = ftp://ftp.qt-project.org/qt/source/
@@ -51,7 +50,8 @@
CONFIGURE_ARGS += -qt-libjpeg -qt-libpng -qt-libmng -qt-zlib
# compile error: error: 'QGtkStyle' has not been declared ??? since 10.12.2012
CONFIGURE_ARGS += -no-gtkstyle
-CONFIGURE_ARGS += -I/usr/include -I/usr/X11/include
+CONFIGURE_ARGS += -I$(BUILD_PREFIX)/include/gtk-2.0
+CONFIGURE_ARGS += -I/usr/X11/include
CONFIGURE_ARGS += -I/usr/X11/share/include
CONFIGURE_ARGS_sparc += -big-endian -host-big-endian
# CONFIGURE_ARGS_i386 += -little-endian -host-big-endian
@@ -63,241 +63,241 @@
EXTRA_INSTALL_EXPORTS = INSTALL_ROOT
-PACKAGES += CSWlibqtcore4-gxx
-PKGFILES_CSWlibqtcore4-gxx += $(call baseisadirs,$(libdir),libQtCore\.so\.4(\.\d+)*)
-SPKG_DESC_CSWlibqtcore4-gxx += $(DESCRIPTION), libQtCore.so.4
-# RUNTIME_DEP_PKGS_CSWlibqtcore4-gxx += CSWlibgthread2-0-0
-RUNTIME_DEP_PKGS_CSWlibqtcore4-gxx += CSWlibiconv2
-# RUNTIME_DEP_PKGS_CSWlibqtcore4-gxx += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibqtcore4-gxx += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWlibqtcore4-gxx += CSWlibglib2-0-0
-RUNTIME_DEP_PKGS_CSWlibqtcore4-gxx += CSWlibgcc-s1
+PACKAGES += CSWlibqtcore4
+PKGFILES_CSWlibqtcore4 += $(call baseisadirs,$(libdir),libQtCore\.so\.4(\.\d+)*)
+SPKG_DESC_CSWlibqtcore4 += $(DESCRIPTION), libQtCore.so.4
+# RUNTIME_DEP_PKGS_CSWlibqtcore4 += CSWlibgthread2-0-0
+RUNTIME_DEP_PKGS_CSWlibqtcore4 += CSWlibiconv2
+# RUNTIME_DEP_PKGS_CSWlibqtcore4 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibqtcore4 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlibqtcore4 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibqtcore4 += CSWlibgcc-s1
-PACKAGES += CSWlibqtgui4-gxx
-CATALOGNAME_CSWlibqtgui4-gxx = libqtgui4_gxx
-PKGFILES_CSWlibqtgui4-gxx += $(call baseisadirs,$(libdir),libQtGui\.so\.4(\.\d+)*)
-SPKG_DESC_CSWlibqtgui4-gxx += $(DESCRIPTION), libQtGui.so.4
-# RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibgthread2-0-0
-# RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibxrender
-RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibglib2-0-0
-RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibqtcore4-gxx
-RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx_sparc += CSWlibgobject2-0-0
-RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx_sparc += CSWlibfontconfig1
-RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibfreetype6
-RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += $(RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx_$(GARCH))
-CHECKPKG_OVERRIDES_CSWlibqtgui4-gxx += file-with-bad-content|/usr/share|root/opt/csw/gxx/lib/libQtGui.so.4.8.1
+PACKAGES += CSWlibqtgui4
+CATALOGNAME_CSWlibqtgui4 = libqtgui4_gxx
+PKGFILES_CSWlibqtgui4 += $(call baseisadirs,$(libdir),libQtGui\.so\.4(\.\d+)*)
+SPKG_DESC_CSWlibqtgui4 += $(DESCRIPTION), libQtGui.so.4
+# RUNTIME_DEP_PKGS_CSWlibqtgui4 += CSWlibgthread2-0-0
+# RUNTIME_DEP_PKGS_CSWlibqtgui4 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibqtgui4 += CSWlibxrender
+RUNTIME_DEP_PKGS_CSWlibqtgui4 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlibqtgui4 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibqtgui4 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibqtgui4 += CSWlibqtcore4
+RUNTIME_DEP_PKGS_CSWlibqtgui4_sparc += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWlibqtgui4_sparc += CSWlibfontconfig1
+RUNTIME_DEP_PKGS_CSWlibqtgui4 += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWlibqtgui4 += $(RUNTIME_DEP_PKGS_CSWlibqtgui4_$(GARCH))
+CHECKPKG_OVERRIDES_CSWlibqtgui4 += file-with-bad-content|/usr/share|root/opt/csw/gxx/lib/libQtGui.so.4.8.1
-PACKAGES += CSWqt4-gxx-dev
-SPKG_DESC_CSWqt4-gxx-dev += $(DESCRIPTION), development files
-PKGFILES_CSWqt4-gxx-dev += $(PKGFILES_DEVEL)
-PKGFILES_CSWqt4-gxx-dev += $(call baseisadirs,$(bindir),.*)
-PKGFILES_CSWqt4-gxx-dev += $(prefix)/examples/.*
-PKGFILES_CSWqt4-gxx-dev += $(prefix)/plugins/.*
-PKGFILES_CSWqt4-gxx-dev += $(prefix)/demos/.*
-PKGFILES_CSWqt4-gxx-dev += $(prefix)/imports/.*
-PKGFILES_CSWqt4-gxx-dev += $(prefix)/mkspecs/.*
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibqtscript4-gxx
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibqtdesignercomponents4-gxx
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibqtdesigner4-gxx
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibqtxml4-gxx
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibqthelp4-gxx
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibqttest4-gxx
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibqtnetwork4-gxx
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibqtdbus4-gxx
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWdbus
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibqtclucene4-gxx
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibqtcore4-gxx
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibqtscripttools4-gxx
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibqtdeclarative4-gxx
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibqtgui4-gxx
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibqtopengl4-gxx
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibqtmultimedia4-gxx
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibqtsvg4-gxx
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibphonon4-gxx
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibqtsql4-gxx
-# RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibgthread2-0-0
-# RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibgmodule2-0-0
-# RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWgstreamer
-# RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibxrender
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibgobject2-0-0
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWmesa
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibglib2-0-0
-# RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibxml2-2
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWgstplugins
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibsybdb5
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWsqlite
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibpq5
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibodbc2
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibtiff3
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibmysqlclient18
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev_sparc += CSWlibfontconfig1
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev_sparc += CSWlibfreetype6
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += $(RUNTIME_DEP_PKGS_CSWqt4-gxx-dev_$(GARCH))
+PACKAGES += CSWqt4-dev
+SPKG_DESC_CSWqt4-dev += $(DESCRIPTION), development files
+PKGFILES_CSWqt4-dev += $(PKGFILES_DEVEL)
+PKGFILES_CSWqt4-dev += $(call baseisadirs,$(bindir),.*)
+PKGFILES_CSWqt4-dev += $(prefix)/examples/.*
+PKGFILES_CSWqt4-dev += $(prefix)/plugins/.*
+PKGFILES_CSWqt4-dev += $(prefix)/demos/.*
+PKGFILES_CSWqt4-dev += $(prefix)/imports/.*
+PKGFILES_CSWqt4-dev += $(prefix)/mkspecs/.*
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtscript4
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtdesignercomponents4
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtdesigner4
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtxml4
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqthelp4
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqttest4
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtnetwork4
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtdbus4
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWdbus
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtclucene4
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtcore4
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtscripttools4
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtdeclarative4
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtgui4
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtopengl4
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtmultimedia4
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtsvg4
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibphonon4
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtsql4
+# RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibgthread2-0-0
+# RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibgmodule2-0-0
+# RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWgstreamer
+# RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibxrender
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWmesa
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibglib2-0-0
+# RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWgstplugins
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibsybdb5
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWsqlite
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibpq5
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibodbc2
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibtiff3
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibmysqlclient18
+RUNTIME_DEP_PKGS_CSWqt4-dev_sparc += CSWlibfontconfig1
+RUNTIME_DEP_PKGS_CSWqt4-dev_sparc += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWqt4-dev += $(RUNTIME_DEP_PKGS_CSWqt4-dev_$(GARCH))
# These are code examples.
-CHECKPKG_OVERRIDES_CSWqt4-gxx-dev += binary-architecture-does-not-match-placement
+CHECKPKG_OVERRIDES_CSWqt4-dev += binary-architecture-does-not-match-placement
# REFINE this later!
-CHECKPKG_OVERRIDES_CSWqt4-gxx-dev += file-with-bad-content
-CHECKPKG_OVERRIDES_CSWqt4-gxx-dev += discouraged-path-in-pkgmap
+CHECKPKG_OVERRIDES_CSWqt4-dev += file-with-bad-content
+CHECKPKG_OVERRIDES_CSWqt4-dev += discouraged-path-in-pkgmap
# because libdbus needs /etc/machine-id which can generated with a tool of CSWdbus
-CHECKPKG_OVERRIDES_CSWqt4-gxx-dev += surplus-dependency|CSWdbus
+CHECKPKG_OVERRIDES_CSWqt4-dev += surplus-dependency|CSWdbus
-PACKAGES += CSWlibqthelp4-gxx
-PKGFILES_CSWlibqthelp4-gxx += $(call baseisadirs,$(libdir),libQtHelp\.so\.4(\.\d+)*)
-SPKG_DESC_CSWlibqthelp4-gxx += $(DESCRIPTION), libQtHelp.so.4
-RUNTIME_DEP_PKGS_CSWlibqthelp4-gxx += CSWlibqtnetwork4-gxx
-RUNTIME_DEP_PKGS_CSWlibqthelp4-gxx += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWlibqthelp4-gxx += CSWlibqtgui4-gxx
-RUNTIME_DEP_PKGS_CSWlibqthelp4-gxx += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibqthelp4-gxx += CSWlibqtcore4-gxx
-RUNTIME_DEP_PKGS_CSWlibqthelp4-gxx += CSWlibqtsql4-gxx
-RUNTIME_DEP_PKGS_CSWlibqthelp4-gxx += CSWlibqtclucene4-gxx
+PACKAGES += CSWlibqthelp4
+PKGFILES_CSWlibqthelp4 += $(call baseisadirs,$(libdir),libQtHelp\.so\.4(\.\d+)*)
+SPKG_DESC_CSWlibqthelp4 += $(DESCRIPTION), libQtHelp.so.4
+RUNTIME_DEP_PKGS_CSWlibqthelp4 += CSWlibqtnetwork4
+RUNTIME_DEP_PKGS_CSWlibqthelp4 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlibqthelp4 += CSWlibqtgui4
+RUNTIME_DEP_PKGS_CSWlibqthelp4 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibqthelp4 += CSWlibqtcore4
+RUNTIME_DEP_PKGS_CSWlibqthelp4 += CSWlibqtsql4
+RUNTIME_DEP_PKGS_CSWlibqthelp4 += CSWlibqtclucene4
-PACKAGES += CSWlibqtmultimedia4-gxx
-PKGFILES_CSWlibqtmultimedia4-gxx += $(call baseisadirs,$(libdir),libQtMultimedia\.so\.4(\.\d+)*)
-SPKG_DESC_CSWlibqtmultimedia4-gxx += $(DESCRIPTION), libQtMultimedia.so.4
-RUNTIME_DEP_PKGS_CSWlibqtmultimedia4-gxx += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibqtmultimedia4-gxx += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWlibqtmultimedia4-gxx += CSWlibqtgui4-gxx
-RUNTIME_DEP_PKGS_CSWlibqtmultimedia4-gxx += CSWlibqtcore4-gxx
+PACKAGES += CSWlibqtmultimedia4
+PKGFILES_CSWlibqtmultimedia4 += $(call baseisadirs,$(libdir),libQtMultimedia\.so\.4(\.\d+)*)
+SPKG_DESC_CSWlibqtmultimedia4 += $(DESCRIPTION), libQtMultimedia.so.4
+RUNTIME_DEP_PKGS_CSWlibqtmultimedia4 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibqtmultimedia4 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlibqtmultimedia4 += CSWlibqtgui4
+RUNTIME_DEP_PKGS_CSWlibqtmultimedia4 += CSWlibqtcore4
-PACKAGES += CSWlibqtnetwork4-gxx
-PKGFILES_CSWlibqtnetwork4-gxx += $(call baseisadirs,$(libdir),libQtNetwork\.so\.4(\.\d+)*)
-SPKG_DESC_CSWlibqtnetwork4-gxx += $(DESCRIPTION), libQtNetwork.so.4
-RUNTIME_DEP_PKGS_CSWlibqtnetwork4-gxx += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibqtnetwork4-gxx += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWlibqtnetwork4-gxx += CSWlibqtcore4-gxx
-CHECKPKG_OVERRIDES_CSWlibqtnetwork4-gxx += file-with-bad-content|/usr/share|root/opt/csw/gxx/lib/libQtNetwork.so.4.8.1
+PACKAGES += CSWlibqtnetwork4
+PKGFILES_CSWlibqtnetwork4 += $(call baseisadirs,$(libdir),libQtNetwork\.so\.4(\.\d+)*)
+SPKG_DESC_CSWlibqtnetwork4 += $(DESCRIPTION), libQtNetwork.so.4
+RUNTIME_DEP_PKGS_CSWlibqtnetwork4 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibqtnetwork4 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlibqtnetwork4 += CSWlibqtcore4
+CHECKPKG_OVERRIDES_CSWlibqtnetwork4 += file-with-bad-content|/usr/share|root/opt/csw/gxx/lib/libQtNetwork.so.4.8.1
-PACKAGES += CSWlibqtopengl4-gxx
-PKGFILES_CSWlibqtopengl4-gxx += $(call baseisadirs,$(libdir),libQtOpenGL\.so\.4(\.\d+)*)
-SPKG_DESC_CSWlibqtopengl4-gxx += $(DESCRIPTION), libQtOpenGL.so.4
-RUNTIME_DEP_PKGS_CSWlibqtopengl4-gxx += CSWlibxrender
-RUNTIME_DEP_PKGS_CSWlibqtopengl4-gxx += CSWlibqtcore4-gxx
-RUNTIME_DEP_PKGS_CSWlibqtopengl4-gxx += CSWmesa
-RUNTIME_DEP_PKGS_CSWlibqtopengl4-gxx += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWlibqtopengl4-gxx += CSWlibqtgui4-gxx
-RUNTIME_DEP_PKGS_CSWlibqtopengl4-gxx += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibqtopengl4-gxx_sparc += CSWlibfontconfig1
-RUNTIME_DEP_PKGS_CSWlibqtopengl4-gxx_sparc += CSWlibfreetype6
-RUNTIME_DEP_PKGS_CSWlibqtopengl4-gxx += $(RUNTIME_DEP_PKGS_CSWlibqtopengl4-gxx_$(GARCH))
+PACKAGES += CSWlibqtopengl4
+PKGFILES_CSWlibqtopengl4 += $(call baseisadirs,$(libdir),libQtOpenGL\.so\.4(\.\d+)*)
+SPKG_DESC_CSWlibqtopengl4 += $(DESCRIPTION), libQtOpenGL.so.4
+RUNTIME_DEP_PKGS_CSWlibqtopengl4 += CSWlibxrender
+RUNTIME_DEP_PKGS_CSWlibqtopengl4 += CSWlibqtcore4
+RUNTIME_DEP_PKGS_CSWlibqtopengl4 += CSWmesa
+RUNTIME_DEP_PKGS_CSWlibqtopengl4 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlibqtopengl4 += CSWlibqtgui4
+RUNTIME_DEP_PKGS_CSWlibqtopengl4 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibqtopengl4_sparc += CSWlibfontconfig1
+RUNTIME_DEP_PKGS_CSWlibqtopengl4_sparc += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWlibqtopengl4 += $(RUNTIME_DEP_PKGS_CSWlibqtopengl4_$(GARCH))
-PACKAGES += CSWlibqtscript4-gxx
-PKGFILES_CSWlibqtscript4-gxx += $(call baseisadirs,$(libdir),libQtScript\.so\.4(\.\d+)*)
-SPKG_DESC_CSWlibqtscript4-gxx += $(DESCRIPTION), libQtScript.so.4
-RUNTIME_DEP_PKGS_CSWlibqtscript4-gxx += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibqtscript4-gxx += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWlibqtscript4-gxx += CSWlibqtcore4-gxx
+PACKAGES += CSWlibqtscript4
+PKGFILES_CSWlibqtscript4 += $(call baseisadirs,$(libdir),libQtScript\.so\.4(\.\d+)*)
+SPKG_DESC_CSWlibqtscript4 += $(DESCRIPTION), libQtScript.so.4
+RUNTIME_DEP_PKGS_CSWlibqtscript4 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibqtscript4 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlibqtscript4 += CSWlibqtcore4
-PACKAGES += CSWlibqtscripttools4-gxx
-PKGFILES_CSWlibqtscripttools4-gxx += $(call baseisadirs,$(libdir),libQtScriptTools\.so\.4(\.\d+)*)
-SPKG_DESC_CSWlibqtscripttools4-gxx += $(DESCRIPTION), libQtScriptTools.so.4
-RUNTIME_DEP_PKGS_CSWlibqtscripttools4-gxx += CSWlibqtscript4-gxx
-RUNTIME_DEP_PKGS_CSWlibqtscripttools4-gxx += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibqtscripttools4-gxx += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWlibqtscripttools4-gxx += CSWlibqtgui4-gxx
-RUNTIME_DEP_PKGS_CSWlibqtscripttools4-gxx += CSWlibqtcore4-gxx
+PACKAGES += CSWlibqtscripttools4
+PKGFILES_CSWlibqtscripttools4 += $(call baseisadirs,$(libdir),libQtScriptTools\.so\.4(\.\d+)*)
+SPKG_DESC_CSWlibqtscripttools4 += $(DESCRIPTION), libQtScriptTools.so.4
+RUNTIME_DEP_PKGS_CSWlibqtscripttools4 += CSWlibqtscript4
+RUNTIME_DEP_PKGS_CSWlibqtscripttools4 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibqtscripttools4 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlibqtscripttools4 += CSWlibqtgui4
+RUNTIME_DEP_PKGS_CSWlibqtscripttools4 += CSWlibqtcore4
-PACKAGES += CSWlibqtsql4-gxx
-PKGFILES_CSWlibqtsql4-gxx += $(call baseisadirs,$(libdir),libQtSql\.so\.4(\.\d+)*)
-SPKG_DESC_CSWlibqtsql4-gxx += $(DESCRIPTION), libQtSql.so.4
-RUNTIME_DEP_PKGS_CSWlibqtsql4-gxx += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibqtsql4-gxx += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWlibqtsql4-gxx += CSWlibqtcore4-gxx
+PACKAGES += CSWlibqtsql4
+PKGFILES_CSWlibqtsql4 += $(call baseisadirs,$(libdir),libQtSql\.so\.4(\.\d+)*)
+SPKG_DESC_CSWlibqtsql4 += $(DESCRIPTION), libQtSql.so.4
+RUNTIME_DEP_PKGS_CSWlibqtsql4 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibqtsql4 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlibqtsql4 += CSWlibqtcore4
-PACKAGES += CSWlibqtsvg4-gxx
-PKGFILES_CSWlibqtsvg4-gxx += $(call baseisadirs,$(libdir),libQtSvg\.so\.4(\.\d+)*)
-SPKG_DESC_CSWlibqtsvg4-gxx += $(DESCRIPTION), libQtSvg.so.4
-RUNTIME_DEP_PKGS_CSWlibqtsvg4-gxx += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibqtsvg4-gxx += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWlibqtsvg4-gxx += CSWlibqtgui4-gxx
-RUNTIME_DEP_PKGS_CSWlibqtsvg4-gxx += CSWlibqtcore4-gxx
+PACKAGES += CSWlibqtsvg4
+PKGFILES_CSWlibqtsvg4 += $(call baseisadirs,$(libdir),libQtSvg\.so\.4(\.\d+)*)
+SPKG_DESC_CSWlibqtsvg4 += $(DESCRIPTION), libQtSvg.so.4
+RUNTIME_DEP_PKGS_CSWlibqtsvg4 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibqtsvg4 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlibqtsvg4 += CSWlibqtgui4
+RUNTIME_DEP_PKGS_CSWlibqtsvg4 += CSWlibqtcore4
-PACKAGES += CSWlibqttest4-gxx
-PKGFILES_CSWlibqttest4-gxx += $(call baseisadirs,$(libdir),libQtTest\.so\.4(\.\d+)*)
-SPKG_DESC_CSWlibqttest4-gxx += $(DESCRIPTION), libQtTest.so.4
-RUNTIME_DEP_PKGS_CSWlibqttest4-gxx += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibqttest4-gxx += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWlibqttest4-gxx += CSWlibqtcore4-gxx
+PACKAGES += CSWlibqttest4
+PKGFILES_CSWlibqttest4 += $(call baseisadirs,$(libdir),libQtTest\.so\.4(\.\d+)*)
+SPKG_DESC_CSWlibqttest4 += $(DESCRIPTION), libQtTest.so.4
+RUNTIME_DEP_PKGS_CSWlibqttest4 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibqttest4 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlibqttest4 += CSWlibqtcore4
-PACKAGES += CSWlibphonon4-gxx
-PKGFILES_CSWlibphonon4-gxx += $(call baseisadirs,$(libdir),libphonon\.so\.4(\.\d+)*)
-SPKG_DESC_CSWlibphonon4-gxx += $(DESCRIPTION), libphonon.so.4
-RUNTIME_DEP_PKGS_CSWlibphonon4-gxx += CSWlibqtxml4-gxx
-RUNTIME_DEP_PKGS_CSWlibphonon4-gxx += CSWlibqtdbus4-gxx
-RUNTIME_DEP_PKGS_CSWlibphonon4-gxx += CSWlibqtcore4-gxx
-RUNTIME_DEP_PKGS_CSWlibphonon4-gxx += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWlibphonon4-gxx += CSWlibqtgui4-gxx
-RUNTIME_DEP_PKGS_CSWlibphonon4-gxx += CSWlibgcc-s1
+PACKAGES += CSWlibphonon4
+PKGFILES_CSWlibphonon4 += $(call baseisadirs,$(libdir),libphonon\.so\.4(\.\d+)*)
+SPKG_DESC_CSWlibphonon4 += $(DESCRIPTION), libphonon.so.4
+RUNTIME_DEP_PKGS_CSWlibphonon4 += CSWlibqtxml4
+RUNTIME_DEP_PKGS_CSWlibphonon4 += CSWlibqtdbus4
+RUNTIME_DEP_PKGS_CSWlibphonon4 += CSWlibqtcore4
+RUNTIME_DEP_PKGS_CSWlibphonon4 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlibphonon4 += CSWlibqtgui4
+RUNTIME_DEP_PKGS_CSWlibphonon4 += CSWlibgcc-s1
-PACKAGES += CSWlibqtclucene4-gxx
-PKGFILES_CSWlibqtclucene4-gxx += $(call baseisadirs,$(libdir),libQtCLucene\.so\.4(\.\d+)*)
-SPKG_DESC_CSWlibqtclucene4-gxx += $(DESCRIPTION), libQtCLucene.so.4
-RUNTIME_DEP_PKGS_CSWlibqtclucene4-gxx += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibqtclucene4-gxx += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWlibqtclucene4-gxx += CSWlibqtcore4-gxx
-RUNTIME_DEP_PKGS_CSWlibqtclucene4-gxx += CSWlibqtdbus4-gxx
+PACKAGES += CSWlibqtclucene4
+PKGFILES_CSWlibqtclucene4 += $(call baseisadirs,$(libdir),libQtCLucene\.so\.4(\.\d+)*)
+SPKG_DESC_CSWlibqtclucene4 += $(DESCRIPTION), libQtCLucene.so.4
+RUNTIME_DEP_PKGS_CSWlibqtclucene4 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibqtclucene4 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlibqtclucene4 += CSWlibqtcore4
+RUNTIME_DEP_PKGS_CSWlibqtclucene4 += CSWlibqtdbus4
-PACKAGES += CSWlibqtdbus4-gxx
-PKGFILES_CSWlibqtdbus4-gxx += $(call baseisadirs,$(libdir),libQtDBus\.so\.4(\.\d+)*)
-SPKG_DESC_CSWlibqtdbus4-gxx += $(DESCRIPTION), libQtDBus.so.4
-RUNTIME_DEP_PKGS_CSWlibqtdbus4-gxx += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibqtdbus4-gxx += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWlibqtdbus4-gxx += CSWlibqtxml4-gxx
-RUNTIME_DEP_PKGS_CSWlibqtdbus4-gxx += CSWlibqtcore4-gxx
+PACKAGES += CSWlibqtdbus4
+PKGFILES_CSWlibqtdbus4 += $(call baseisadirs,$(libdir),libQtDBus\.so\.4(\.\d+)*)
+SPKG_DESC_CSWlibqtdbus4 += $(DESCRIPTION), libQtDBus.so.4
+RUNTIME_DEP_PKGS_CSWlibqtdbus4 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibqtdbus4 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlibqtdbus4 += CSWlibqtxml4
+RUNTIME_DEP_PKGS_CSWlibqtdbus4 += CSWlibqtcore4
-PACKAGES += CSWlibqtdeclarative4-gxx
-PKGFILES_CSWlibqtdeclarative4-gxx += $(call baseisadirs,$(libdir),libQtDeclarative\.so\.4(\.\d+)*)
-SPKG_DESC_CSWlibqtdeclarative4-gxx += $(DESCRIPTION), libQtDeclarative.so.4
-RUNTIME_DEP_PKGS_CSWlibqtdeclarative4-gxx += CSWlibqtscript4-gxx
-RUNTIME_DEP_PKGS_CSWlibqtdeclarative4-gxx += CSWlibqtnetwork4-gxx
-RUNTIME_DEP_PKGS_CSWlibqtdeclarative4-gxx += CSWlibqtcore4-gxx
-RUNTIME_DEP_PKGS_CSWlibqtdeclarative4-gxx += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWlibqtdeclarative4-gxx += CSWlibqtgui4-gxx
-RUNTIME_DEP_PKGS_CSWlibqtdeclarative4-gxx += CSWlibqtsvg4-gxx
-RUNTIME_DEP_PKGS_CSWlibqtdeclarative4-gxx += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibqtdeclarative4-gxx += CSWlibqtsql4-gxx
+PACKAGES += CSWlibqtdeclarative4
+PKGFILES_CSWlibqtdeclarative4 += $(call baseisadirs,$(libdir),libQtDeclarative\.so\.4(\.\d+)*)
+SPKG_DESC_CSWlibqtdeclarative4 += $(DESCRIPTION), libQtDeclarative.so.4
+RUNTIME_DEP_PKGS_CSWlibqtdeclarative4 += CSWlibqtscript4
+RUNTIME_DEP_PKGS_CSWlibqtdeclarative4 += CSWlibqtnetwork4
+RUNTIME_DEP_PKGS_CSWlibqtdeclarative4 += CSWlibqtcore4
+RUNTIME_DEP_PKGS_CSWlibqtdeclarative4 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlibqtdeclarative4 += CSWlibqtgui4
+RUNTIME_DEP_PKGS_CSWlibqtdeclarative4 += CSWlibqtsvg4
+RUNTIME_DEP_PKGS_CSWlibqtdeclarative4 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibqtdeclarative4 += CSWlibqtsql4
-PACKAGES += CSWlibqtdesigner4-gxx
-PKGFILES_CSWlibqtdesigner4-gxx += $(call baseisadirs,$(libdir),libQtDesigner\.so\.4(\.\d+)*)
-SPKG_DESC_CSWlibqtdesigner4-gxx += $(DESCRIPTION), libQtDesigner.so.4
-RUNTIME_DEP_PKGS_CSWlibqtdesigner4-gxx += CSWlibqtscript4-gxx
-RUNTIME_DEP_PKGS_CSWlibqtdesigner4-gxx += CSWlibqtxml4-gxx
-RUNTIME_DEP_PKGS_CSWlibqtdesigner4-gxx += CSWlibqtcore4-gxx
-RUNTIME_DEP_PKGS_CSWlibqtdesigner4-gxx += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWlibqtdesigner4-gxx += CSWlibqtgui4-gxx
-RUNTIME_DEP_PKGS_CSWlibqtdesigner4-gxx += CSWlibgcc-s1
+PACKAGES += CSWlibqtdesigner4
+PKGFILES_CSWlibqtdesigner4 += $(call baseisadirs,$(libdir),libQtDesigner\.so\.4(\.\d+)*)
+SPKG_DESC_CSWlibqtdesigner4 += $(DESCRIPTION), libQtDesigner.so.4
+RUNTIME_DEP_PKGS_CSWlibqtdesigner4 += CSWlibqtscript4
+RUNTIME_DEP_PKGS_CSWlibqtdesigner4 += CSWlibqtxml4
+RUNTIME_DEP_PKGS_CSWlibqtdesigner4 += CSWlibqtcore4
+RUNTIME_DEP_PKGS_CSWlibqtdesigner4 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlibqtdesigner4 += CSWlibqtgui4
+RUNTIME_DEP_PKGS_CSWlibqtdesigner4 += CSWlibgcc-s1
-PACKAGES += CSWlibqtdesignercomponents4-gxx
-PKGFILES_CSWlibqtdesignercomponents4-gxx += $(call baseisadirs,$(libdir),libQtDesignerComponents\.so\.4(\.\d+)*)
-SPKG_DESC_CSWlibqtdesignercomponents4-gxx += $(DESCRIPTION), libQtDesignerComponents.so.4
-RUNTIME_DEP_PKGS_CSWlibqtdesignercomponents4-gxx += CSWlibqtscript4-gxx
-RUNTIME_DEP_PKGS_CSWlibqtdesignercomponents4-gxx += CSWlibqtdesigner4-gxx
-RUNTIME_DEP_PKGS_CSWlibqtdesignercomponents4-gxx += CSWlibqtxml4-gxx
-RUNTIME_DEP_PKGS_CSWlibqtdesignercomponents4-gxx += CSWlibqtcore4-gxx
-RUNTIME_DEP_PKGS_CSWlibqtdesignercomponents4-gxx += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWlibqtdesignercomponents4-gxx += CSWlibqtgui4-gxx
-RUNTIME_DEP_PKGS_CSWlibqtdesignercomponents4-gxx += CSWlibgcc-s1
+PACKAGES += CSWlibqtdesignercomponents4
+PKGFILES_CSWlibqtdesignercomponents4 += $(call baseisadirs,$(libdir),libQtDesignerComponents\.so\.4(\.\d+)*)
+SPKG_DESC_CSWlibqtdesignercomponents4 += $(DESCRIPTION), libQtDesignerComponents.so.4
+RUNTIME_DEP_PKGS_CSWlibqtdesignercomponents4 += CSWlibqtscript4
+RUNTIME_DEP_PKGS_CSWlibqtdesignercomponents4 += CSWlibqtdesigner4
+RUNTIME_DEP_PKGS_CSWlibqtdesignercomponents4 += CSWlibqtxml4
+RUNTIME_DEP_PKGS_CSWlibqtdesignercomponents4 += CSWlibqtcore4
+RUNTIME_DEP_PKGS_CSWlibqtdesignercomponents4 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlibqtdesignercomponents4 += CSWlibqtgui4
+RUNTIME_DEP_PKGS_CSWlibqtdesignercomponents4 += CSWlibgcc-s1
-PACKAGES += CSWlibqtxml4-gxx
-PKGFILES_CSWlibqtxml4-gxx += $(call baseisadirs,$(libdir),libQtXml\.so\.4(\.\d+)*)
-SPKG_DESC_CSWlibqtxml4-gxx += $(DESCRIPTION), libQtXml.so.4
-RUNTIME_DEP_PKGS_CSWlibqtxml4-gxx += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibqtxml4-gxx += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWlibqtxml4-gxx += CSWlibqtcore4-gxx
+PACKAGES += CSWlibqtxml4
+PKGFILES_CSWlibqtxml4 += $(call baseisadirs,$(libdir),libQtXml\.so\.4(\.\d+)*)
+SPKG_DESC_CSWlibqtxml4 += $(DESCRIPTION), libQtXml.so.4
+RUNTIME_DEP_PKGS_CSWlibqtxml4 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibqtxml4 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlibqtxml4 += CSWlibqtcore4
-PACKAGES += CSWqt4-gxx-doc
-SPKG_DESC_CSWqt4-gxx-doc += $(DESCRIPTION), documentation
+PACKAGES += CSWqt4-doc
+SPKG_DESC_CSWqt4-doc += $(DESCRIPTION), documentation
# Catch-all
-ARCHALL_CSWqt4-gxx-doc = 1
-CHECKPKG_OVERRIDES_CSWqt4-gxx-doc += file-with-bad-content
+ARCHALL_CSWqt4-doc = 1
+CHECKPKG_OVERRIDES_CSWqt4-doc += file-with-bad-content
include gar/category.mk
Modified: csw/mgar/pkg/qt4-gcc/trunk/files/0001-shapeinput.patch
===================================================================
--- csw/mgar/pkg/qt4-gcc/trunk/files/0001-shapeinput.patch 2013-04-02 06:54:56 UTC (rev 20565)
+++ csw/mgar/pkg/qt4-gcc/trunk/files/0001-shapeinput.patch 2013-04-02 11:49:29 UTC (rev 20566)
@@ -24,7 +24,7 @@
AnyPropertyType, &type, &f,&n,&a,&data);
if (data) XFree(data);
+
-+#ifdef QT_NO_SHAPE
++#ifndef QT_NO_SHAPE
if (type) {
// When ShapeInput and ShapeBounding are not set they return a single rectangle with the geometry of the window, this is why we
// need an && here so that in the case one is set and the other is not we still get the correct result.
@@ -42,7 +42,7 @@
// innermost window.
}
-+#ifdef QT_NO_SHAPE
++#ifndef QT_NO_SHAPE
// No children!
if (!windowContainsMouse)
return 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list