[csw-devel] SF.net SVN: gar:[21271] csw/mgar/pkg/qt4-gcc/trunk/Makefile

cgrzemba at users.sourceforge.net cgrzemba at users.sourceforge.net
Wed Jun 5 10:00:22 CEST 2013


Revision: 21271
          http://gar.svn.sourceforge.net/gar/?rev=21271&view=rev
Author:   cgrzemba
Date:     2013-06-05 08:00:09 +0000 (Wed, 05 Jun 2013)
Log Message:
-----------
qt4-gcc/trunk: refine runtime dependencies

Modified Paths:
--------------
    csw/mgar/pkg/qt4-gcc/trunk/Makefile

Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/qt4-gcc/trunk/Makefile	2013-06-04 20:25:25 UTC (rev 21270)
+++ csw/mgar/pkg/qt4-gcc/trunk/Makefile	2013-06-05 08:00:09 UTC (rev 21271)
@@ -35,6 +35,7 @@
 BUILD_DEP_PKGS += CSWunixodbc-dev
 BUILD_DEP_PKGS += CSWpostgresql-dev
 BUILD_DEP_PKGS += CSWfreetds-dev
+BUILD_DEP_PKGS += CSWmysql-dev
 
 # http://wiki.opencsw.org/porting-faq#toc9
 EXTRA_CFLAGS = -DSUN_OGL_NO_VERTEX_MACROS
@@ -109,7 +110,6 @@
 RUNTIME_DEP_PKGS_CSWlibqtcore4 += CSWlibstdc++6
 RUNTIME_DEP_PKGS_CSWlibqtcore4 += CSWlibglib2-0-0
 RUNTIME_DEP_PKGS_CSWlibqtcore4 += CSWlibgcc-s1
-OBSOLETED_BY_CSWlibqtcore4 = CSWlibqtcore4-gxx
 
 PACKAGES += CSWlibqtgui4
 PKGFILES_CSWlibqtgui4 += $(call baseisadirs,$(libdir),libQtGui\.so\.4(\.\d+)*)
@@ -124,15 +124,15 @@
 RUNTIME_DEP_PKGS_CSWlibqtgui4 += CSWlibfontconfig1
 RUNTIME_DEP_PKGS_CSWlibqtgui4 += CSWlibfreetype6
 CHECKPKG_OVERRIDES_CSWlibqtgui4 += file-with-bad-content|/usr/share|root/opt/csw/lib/libQtGui.so.4.8.1
-OBSOLETED_BY_CSWlibqtgui4 = CSWlibqtgui4-gxx
 
 PACKAGES += CSWqt4-dev
 SPKG_DESC_CSWqt4-dev += $(DESCRIPTION), development files
 PKGFILES_CSWqt4-dev += $(PKGFILES_DEVEL)
 PKGFILES_CSWqt4-dev += $(call baseisadirs,$(bindir),.*)
+PKGFILES_CSWqt4-dev += $(libdir)/libQt.*\.prl
 PKGFILES_CSWqt4-dev += $(libdir)/$(NAME)$(MAJOR)/examples/.*
 PKGFILES_CSWqt4-dev += $(libdir)/$(NAME)$(MAJOR)/plugins/.*
-PKGFILES_CSWqt4-dev += $(sharedstatedir)/$(NAME)$(MAJOR)/demos/.*
+PKGFILES_CSWqt4-dev += $(libdir)/$(NAME)$(MAJOR)/demos/.*
 PKGFILES_CSWqt4-dev += $(libdir)/$(NAME)$(MAJOR)/imports/.*
 PKGFILES_CSWqt4-dev += $(sharedstatedir)/$(NAME)$(MAJOR)/mkspecs/.*
 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtscript4
@@ -173,16 +173,16 @@
 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibpq5
 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibsybdb5
 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibmysqlclient18
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibgstbase0-10-0
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibgstinterfaces0-10-0
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibsqlite3-0
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibgstreamer0-10-0
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibgstvideo0-10-0
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibgstaudio0-10-0
 CHECKPKG_OVERRIDES_CSWqt4-dev += surplus-dependency|CSWlibicui18n50
-# These are code examples.
-CHECKPKG_OVERRIDES_CSWqt4-dev += binary-architecture-does-not-match-placement
 
-# REFINE this later!
-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-dev += surplus-dependency|CSWdbus
-OBSOLETED_BY_CSWqt4-dev = CSWqt4-dev-gxx
 
 PACKAGES += CSWlibqthelp4
 PKGFILES_CSWlibqthelp4 += $(call baseisadirs,$(libdir),libQtHelp\.so\.4(\.\d+)*)
@@ -194,7 +194,6 @@
 RUNTIME_DEP_PKGS_CSWlibqthelp4 += CSWlibqtcore4
 RUNTIME_DEP_PKGS_CSWlibqthelp4 += CSWlibqtsql4
 RUNTIME_DEP_PKGS_CSWlibqthelp4 += CSWlibqtclucene4
-OBSOLETED_BY_CSWlibqthelp4 = CSWlibqthelp4-gxx
 
 PACKAGES += CSWlibqtmultimedia4
 PKGFILES_CSWlibqtmultimedia4 += $(call baseisadirs,$(libdir),libQtMultimedia\.so\.4(\.\d+)*)
@@ -203,7 +202,6 @@
 RUNTIME_DEP_PKGS_CSWlibqtmultimedia4 += CSWlibstdc++6
 RUNTIME_DEP_PKGS_CSWlibqtmultimedia4 += CSWlibqtgui4
 RUNTIME_DEP_PKGS_CSWlibqtmultimedia4 += CSWlibqtcore4
-OBSOLETED_BY_CSWlibqtmultimedia4 = CSWlibqtmultimedia4-gxx
 
 PACKAGES += CSWlibqtnetwork4
 PKGFILES_CSWlibqtnetwork4 += $(call baseisadirs,$(libdir),libQtNetwork\.so\.4(\.\d+)*)
@@ -212,7 +210,6 @@
 RUNTIME_DEP_PKGS_CSWlibqtnetwork4 += CSWlibstdc++6
 RUNTIME_DEP_PKGS_CSWlibqtnetwork4 += CSWlibqtcore4
 CHECKPKG_OVERRIDES_CSWlibqtnetwork4 += file-with-bad-content|/usr/share|root/opt/csw/lib/libQtNetwork.so.4.8.1
-OBSOLETED_BY_CSWlibqtnetwork4 = CSWlibqtnetwork4-gxx
 
 PACKAGES += CSWlibqtopengl4
 PKGFILES_CSWlibqtopengl4 += $(call baseisadirs,$(libdir),libQtOpenGL\.so\.4(\.\d+)*)
@@ -225,7 +222,6 @@
 RUNTIME_DEP_PKGS_CSWlibqtopengl4 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibqtopengl4 += CSWlibfreetype6
 RUNTIME_DEP_PKGS_CSWlibqtopengl4 += $(RUNTIME_DEP_PKGS_CSWlibqtopengl4_$(GARCH))
-OBSOLETED_BY_CSWlibqtopengl4 = CSWlibqtopengl4-gxx
 
 
 PACKAGES += CSWlibqtscript4
@@ -234,7 +230,6 @@
 RUNTIME_DEP_PKGS_CSWlibqtscript4 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibqtscript4 += CSWlibstdc++6
 RUNTIME_DEP_PKGS_CSWlibqtscript4 += CSWlibqtcore4
-OBSOLETED_BY_CSWlibqtscript4 = CSWlibqtscript4-gxx
 
 PACKAGES += CSWlibqtscripttools4
 PKGFILES_CSWlibqtscripttools4 += $(call baseisadirs,$(libdir),libQtScriptTools\.so\.4(\.\d+)*)
@@ -244,7 +239,6 @@
 RUNTIME_DEP_PKGS_CSWlibqtscripttools4 += CSWlibstdc++6
 RUNTIME_DEP_PKGS_CSWlibqtscripttools4 += CSWlibqtgui4
 RUNTIME_DEP_PKGS_CSWlibqtscripttools4 += CSWlibqtcore4
-OBSOLETED_BY_CSWlibqtscripttools4 = CSWlibqtscripttools4-gxx
 
 PACKAGES += CSWlibqtsql4
 PKGFILES_CSWlibqtsql4 += $(call baseisadirs,$(libdir),libQtSql\.so\.4(\.\d+)*)
@@ -252,7 +246,6 @@
 RUNTIME_DEP_PKGS_CSWlibqtsql4 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibqtsql4 += CSWlibstdc++6
 RUNTIME_DEP_PKGS_CSWlibqtsql4 += CSWlibqtcore4
-OBSOLETED_BY_CSWlibqtsql4 = CSWlibqtsql4-gxx
 
 PACKAGES += CSWlibqtsvg4
 PKGFILES_CSWlibqtsvg4 += $(call baseisadirs,$(libdir),libQtSvg\.so\.4(\.\d+)*)
@@ -261,7 +254,6 @@
 RUNTIME_DEP_PKGS_CSWlibqtsvg4 += CSWlibstdc++6
 RUNTIME_DEP_PKGS_CSWlibqtsvg4 += CSWlibqtgui4
 RUNTIME_DEP_PKGS_CSWlibqtsvg4 += CSWlibqtcore4
-OBSOLETED_BY_CSWlibqtsvg4 = CSWlibqtsvg4-gxx
 
 PACKAGES += CSWlibqttest4
 PKGFILES_CSWlibqttest4 += $(call baseisadirs,$(libdir),libQtTest\.so\.4(\.\d+)*)
@@ -269,7 +261,6 @@
 RUNTIME_DEP_PKGS_CSWlibqttest4 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibqttest4 += CSWlibstdc++6
 RUNTIME_DEP_PKGS_CSWlibqttest4 += CSWlibqtcore4
-OBSOLETED_BY_CSWlibqttest4 = CSWlibqttest4-gxx
 
 PACKAGES += CSWlibphonon4
 PKGFILES_CSWlibphonon4 += $(call baseisadirs,$(libdir),libphonon\.so\.4(\.\d+)*)
@@ -280,7 +271,6 @@
 RUNTIME_DEP_PKGS_CSWlibphonon4 += CSWlibstdc++6
 RUNTIME_DEP_PKGS_CSWlibphonon4 += CSWlibqtgui4
 RUNTIME_DEP_PKGS_CSWlibphonon4 += CSWlibgcc-s1
-OBSOLETED_BY_CSWlibphonon4 = CSWlibphonon4-gxx
 
 PACKAGES += CSWlibqtclucene4
 PKGFILES_CSWlibqtclucene4 += $(call baseisadirs,$(libdir),libQtCLucene\.so\.4(\.\d+)*)
@@ -289,7 +279,6 @@
 RUNTIME_DEP_PKGS_CSWlibqtclucene4 += CSWlibstdc++6
 RUNTIME_DEP_PKGS_CSWlibqtclucene4 += CSWlibqtcore4
 # RUNTIME_DEP_PKGS_CSWlibqtclucene4 += CSWlibqtdbus4
-OBSOLETED_BY_CSWlibqtclucene4 = CSWlibqtclucene4-gxx
 
 PACKAGES += CSWlibqtdbus4
 PKGFILES_CSWlibqtdbus4 += $(call baseisadirs,$(libdir),libQtDBus\.so\.4(\.\d+)*)
@@ -298,7 +287,6 @@
 RUNTIME_DEP_PKGS_CSWlibqtdbus4 += CSWlibstdc++6
 RUNTIME_DEP_PKGS_CSWlibqtdbus4 += CSWlibqtxml4
 RUNTIME_DEP_PKGS_CSWlibqtdbus4 += CSWlibqtcore4
-OBSOLETED_BY_CSWlibqtdbus4 = CSWlibqtdbus4-gxx
 
 PACKAGES += CSWlibqtdeclarative4
 PKGFILES_CSWlibqtdeclarative4 += $(call baseisadirs,$(libdir),libQtDeclarative\.so\.4(\.\d+)*)
@@ -311,7 +299,6 @@
 # RUNTIME_DEP_PKGS_CSWlibqtdeclarative4 += CSWlibqtsvg4
 RUNTIME_DEP_PKGS_CSWlibqtdeclarative4 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibqtdeclarative4 += CSWlibqtsql4
-OBSOLETED_BY_CSWlibqtdeclarative4 = CSWlibqtdeclarative4-gxx
 
 PACKAGES += CSWlibqtdesigner4
 PKGFILES_CSWlibqtdesigner4 += $(call baseisadirs,$(libdir),libQtDesigner\.so\.4(\.\d+)*)
@@ -322,7 +309,6 @@
 RUNTIME_DEP_PKGS_CSWlibqtdesigner4 += CSWlibstdc++6
 RUNTIME_DEP_PKGS_CSWlibqtdesigner4 += CSWlibqtgui4
 RUNTIME_DEP_PKGS_CSWlibqtdesigner4 += CSWlibgcc-s1
-OBSOLETED_BY_CSWlibqtdesigner4 = CSWlibqtdesigner4-gxx
 
 PACKAGES += CSWlibqtdesignercomponents4
 PKGFILES_CSWlibqtdesignercomponents4 += $(call baseisadirs,$(libdir),libQtDesignerComponents\.so\.4(\.\d+)*)
@@ -334,8 +320,6 @@
 RUNTIME_DEP_PKGS_CSWlibqtdesignercomponents4 += CSWlibstdc++6
 RUNTIME_DEP_PKGS_CSWlibqtdesignercomponents4 += CSWlibqtgui4
 RUNTIME_DEP_PKGS_CSWlibqtdesignercomponents4 += CSWlibgcc-s1
-OBSOLETED_BY_CSWlibqtdesignercomponents4 = CSWlibqtdesignercomponents4-gxx
-CHECKPKG_OVERRIDES_CSWlibqtdesignercomponents4-gxx += catalogname-too-long
 
 PACKAGES += CSWlibqtxml4
 PKGFILES_CSWlibqtxml4 += $(call baseisadirs,$(libdir),libQtXml\.so\.4(\.\d+)*)
@@ -343,14 +327,12 @@
 RUNTIME_DEP_PKGS_CSWlibqtxml4 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibqtxml4 += CSWlibstdc++6
 RUNTIME_DEP_PKGS_CSWlibqtxml4 += CSWlibqtcore4
-OBSOLETED_BY_CSWlibqtxml4 = CSWlibqtxml4-gxx
 
 PACKAGES += CSWqt4-doc
 SPKG_DESC_CSWqt4-doc += $(DESCRIPTION), documentation
 # Catch-all
 ARCHALL_CSWqt4-doc = 1
 CHECKPKG_OVERRIDES_CSWqt4-doc += file-with-bad-content
-OBSOLETED_BY_CSWqt4-doc = CSWqt4-doc-gxx
 
 include gar/category.mk
 

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