SF.net SVN: gar:[25730] csw/mgar/pkg/wxwidgets/trunk/Makefile

[lblume at users.sourceforge.net]

Revision: 25730
          http://sourceforge.net/p/gar/code/25730
Author:   lblume
Date:     2016-05-27 13:11:51 +0000 (Fri, 27 May 2016)
Log Message:
-----------
wxwidgets/trunk: Adjust package content and dependencies for the new version

Modified Paths:
--------------
    csw/mgar/pkg/wxwidgets/trunk/Makefile

Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile
===================================================================
--- csw/mgar/pkg/wxwidgets/trunk/Makefile	2016-05-26 18:48:40 UTC (rev 25729)
+++ csw/mgar/pkg/wxwidgets/trunk/Makefile	2016-05-27 13:11:51 UTC (rev 25730)
@@ -33,20 +33,25 @@
 RUNTIME_DEP_PKGS_CSWwxwidgets += CSWlibexpat1
 RUNTIME_DEP_PKGS_CSWwxwidgets += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWwxwidgets += CSWlibz1
+RUNTIME_DEP_PKGS_CSWwxwidgets += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWwxwidgets += CSWlibstdc++6
 
 RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWwxwidgets
-RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibpng15-15
 RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibgdk-x11-2-0-0
 RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibgdk-pixbuf2-0-0
 RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibjpeg7
-RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibmspack0
 RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibgobject2-0-0
 RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibgtk-x11-2-0-0
 RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibtiff5
 RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibglib2-0-0
 RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWmesa
-RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWpango
 RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibgnomeprintui
+RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibpango1-0-0
+RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibpng16-16
+RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibcairo2
+RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibpangocairo1-0-0
 
 RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWwxwidgets
 RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWwxwidgetsgtk2
@@ -56,11 +61,13 @@
 RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWlibpcre-dev
 RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWfontconfig-dev
 RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWlibfreetype-dev
-RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWlibpng-dev
+RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWlibpng16-dev
 RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWsunx11devel
 RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWlibiconv-dev
 RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWggettext-dev
 RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWlibexpat-dev
+RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWlibstdc++6
 
 BUILD_DEP_PKGS  = $(RUNTIME_DEP_PKGS)
 BUILD_DEP_PKGS += CSWintltool
@@ -69,18 +76,19 @@
 BUILD_DEP_PKGS += CSWlibpcre-dev
 BUILD_DEP_PKGS += CSWfontconfig-dev
 BUILD_DEP_PKGS += CSWlibfreetype-dev
-BUILD_DEP_PKGS += CSWlibpng-dev
+BUILD_DEP_PKGS += CSWlibpng16-dev
 BUILD_DEP_PKGS += CSWsunx11devel
 BUILD_DEP_PKGS += CSWlibiconv-dev
 BUILD_DEP_PKGS += CSWggettext-dev
 BUILD_DEP_PKGS += CSWlibexpat-dev
 BUILD_DEP_PKGS += CSWlibgnomeprintdevel
+BUILD_DEP_PKGS += CSWgstreamer-dev
 
 # Easier than defining each individual .so.xxx
-PKGFILES_CSWwxwidgets     = $(libdir).*libwx_base.*\.so\..*
+PKGFILES_CSWwxwidgets     = $(call baseisadirs,$(libdir),libwx_baseu.*\.so\..*)
 PKGFILES_CSWwxwidgets    += $(sharedir)/locale.*
 
-PKGFILES_CSWwxwidgetsgtk2 = $(libdir).*libwx_gtk2.*\.so\..*
+PKGFILES_CSWwxwidgetsgtk2 = $(call baseisadirs,$(libdir),libwx_gtk2.*\.so\..*)
 
 # PKGFILES is catchall
 # PKGFILES_CSWwxwidgets-dev
@@ -88,8 +96,6 @@
 CATALOGNAME_CSWwxwidgets       = wxwidgets
 CATALOGNAME_CSWwxwidgets-dev   = wxwidgets_dev
 CATALOGNAME_CSWwxwidgetsgtk2   = wxwidgetsgtk2
-CATALOGNAME_CSWwxwidgetsdevel  = wxwidgets_devel_stub 
-CATALOGNAME_CSWwxwidgetscommon = wxwidgets_common_stub
 
 OBSOLETED_BY_CSWwxwidgets     = CSWwxwidgetscommon
 OBSOLETED_BY_CSWwxwidgets-dev = CSWwxwidgetsdevel
@@ -122,10 +128,18 @@
 CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2 += surplus-dependency|CSWlibgnomeprintui
 
 # Only samples inside code comments, can be safely ignored at this point
-CHECKPKG_OVERRIDES_CSWwxwidgets-dev += file-with-bad-content|/usr/share|root/opt/csw/include/wx-2.8/wx/utils.h
-CHECKPKG_OVERRIDES_CSWwxwidgets-dev += file-with-bad-content|/usr/local|root/opt/csw/include/wx-2.8/wx/unix/stdpaths.h
-CHECKPKG_OVERRIDES_CSWwxwidgets-dev += file-with-bad-content|/usr/local|root/opt/csw/include/wx-2.8/wx/generic/helpext.h
+CHECKPKG_OVERRIDES_CSWwxwidgets-dev += file-with-bad-content|/usr/share|root/opt/csw/include/wx-3.1/wx/utils.h
+CHECKPKG_OVERRIDES_CSWwxwidgets-dev += file-with-bad-content|/usr/local|root/opt/csw/include/wx-3.1/wx/unix/stdpaths.h
 
+# The /64/ symlink should be present once installed
+CHECKPKG_OVERRIDES_CSWwxwidgets-dev += file-needed-but-no-package-satisfies-it|/opt/csw/lib/64/wx/config/gtk2-unicode-3.1|CSWwxwidgets-dev|contains|symlink|/opt/csw/bin/amd64/wx-config|which|needs|the|target|file:|/opt/csw/lib/64/wx/config/gtk2-unicode-3.1
+
+# No idea why it complains there...
+CHECKPKG_OVERRIDES_CSWwxwidgets += file-with-bad-content|/usr/local|root/opt/csw/lib/libwx_baseu-3.1.so.0
+CHECKPKG_OVERRIDES_CSWwxwidgets += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/libwx_baseu-3.1.so.0
+CHECKPKG_OVERRIDES_CSWwxwidgets += file-with-bad-content|/usr/share|root/opt/csw/lib/libwx_baseu-3.1.so.0
+CHECKPKG_OVERRIDES_CSWwxwidgets += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libwx_baseu-3.1.so.0
+
 LICENSE = docs/licence.txt
 INSTALL_SCRIPTS = wxwidgets
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.