[csw-devel] SF.net SVN: gar:[21310] csw/mgar/pkg/wxwidgets/trunk
lblume at users.sourceforge.net
lblume at users.sourceforge.net
Sun Jun 9 22:04:46 CEST 2013
Revision: 21310
http://gar.svn.sourceforge.net/gar/?rev=21310&view=rev
Author: lblume
Date: 2013-06-09 20:04:40 +0000 (Sun, 09 Jun 2013)
Log Message:
-----------
wxwidgets/trunk: Bump version to 2.8.12; clean up recipe and rename packages; remove older bits; add 64 bit version
Modified Paths:
--------------
csw/mgar/pkg/wxwidgets/trunk/Makefile
csw/mgar/pkg/wxwidgets/trunk/checksums
Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile
===================================================================
--- csw/mgar/pkg/wxwidgets/trunk/Makefile 2013-06-08 20:01:58 UTC (rev 21309)
+++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2013-06-09 20:04:40 UTC (rev 21310)
@@ -2,8 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-NAME = wxWidgets
-VERSION = 2.8.10
+NAME = wxWidgets
+VERSION = 2.8.12
GARTYPE = v2
define BLURB
wxWidgets lets developers create applications for Win32, Mac OS X, GTK+, X11,
@@ -13,138 +13,85 @@
the platform's own native controls rather than emulating them.
endef
-# The unicode version can't be currently built on Solaris 8. Doing separate
-# builds on Solaris 8 and Solaris 9. Unicode support will start in Solaris 9.
-# More details below, look for 'unicode'.
-# PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386
+DISTFILES = $(NAME)-$(VERSION).tar.bz2
-EXTRA_MODULATORS = VERSION
-
-# Once upon a time, this build also supported the version 2.8.5 for backward
-# compatibility. Unfortunately, it was segfaulting. As a workaround, binary
-# files copied from the old package have been provided.
-MODULATIONS_VERSION = 2.8.10
-
-MERGE_SCRIPTS_isa-i386-version-2.8.5 = copy-only
-MERGE_DIRS_isa-i386-version-2.8.5 = $(libdir)
-MERGE_SCRIPTS_isa-sparcv8-version-2.8.5 = copy-only
-MERGE_DIRS_isa-sparcv8-version-2.8.5 = $(libdir)
-MERGE_SCRIPTS_isa-i386-version-2.8.10 = copy-all
-MERGE_SCRIPTS_isa-sparcv8-version-2.8.10 = copy-all
-
-SOURCEFILES = $(foreach VERSION,$(MODULATIONS_VERSION),$(NAME)-$(VERSION).tar.gz)
-NOEXTRACT = $(filter-out $(NAME)-$(VERSION).tar.gz,$(SOURCEFILES))
-DISTFILES = $(SOURCEFILES)
-DISTFILES += libwx_gtk2u-2.8.so.0.2.0-i386
-DISTFILES += libwx_gtk2u-2.8.so.0.2.0-sparc
-DISTFILES += libwx_gtk2u_gl-2.8.so.0.2.0-i386
-DISTFILES += libwx_gtk2u_gl-2.8.so.0.2.0-sparc
SPKG_SOURCEURL = http://www.wxwidgets.org/
MASTER_SITES = $(SF_MIRRORS)
SF_PROJECT = wxwindows
+#PATCHFILES_isa-i386-version-2.8.12 = 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch
+#PATCHFILES_isa-i386-version-2.8.12 += 0002-Fixing-retarded-checks-for-libGL.patch
+#PATCHFILES_isa-i386-version-2.8.12 += 0003-vsscanf-support-via-ncursesw.patch
+#PATCHFILES_isa-i386-version-2.8.12 += 0005-stupid-vwscanf-workaround.patch
+#PATCHFILES_isa-sparcv8-version-2.8.12 = 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch
+#PATCHFILES_isa-sparcv8-version-2.8.12 += 0002-Fixing-retarded-checks-for-libGL.patch
+#PATCHFILES_isa-sparcv8-version-2.8.12 += 0003-vsscanf-support-via-ncursesw.patch
+#PATCHFILES_isa-sparcv8-version-2.8.12 += 0005-stupid-vwscanf-workaround.patch
-PATCHFILES_isa-i386-version-2.8.5 = 0500-wxT-macro-first-iteration.patch
-PATCHFILES_isa-i386-version-2.8.5 += 0501-a-possible-fix-to-wxchar.h.patch
-PATCHFILES_isa-i386-version-2.8.5 += 0002-Fixing-retarded-checks-for-libGL.patch
-PATCHFILES_isa-i386-version-2.8.5 += 0003-vsscanf-support-via-ncursesw.patch
-PATCHFILES_isa-i386-version-2.8.5 += 0004-add-monodll_appbase.so-to-wxrc.patch
-PATCHFILES_isa-i386-version-2.8.5 += 0005-stupid-vwscanf-workaround.patch
-PATCHFILES_isa-sparcv8-version-2.8.5 = 0500-wxT-macro-first-iteration.patch
-PATCHFILES_isa-sparcv8-version-2.8.5 += 0501-a-possible-fix-to-wxchar.h.patch
-PATCHFILES_isa-sparcv8-version-2.8.5 += 0002-Fixing-retarded-checks-for-libGL.patch
-PATCHFILES_isa-sparcv8-version-2.8.5 += 0003-vsscanf-support-via-ncursesw.patch
-PATCHFILES_isa-sparcv8-version-2.8.5 += 0004-add-monodll_appbase.so-to-wxrc.patch
-PATCHFILES_isa-sparcv8-version-2.8.5 += 0005-stupid-vwscanf-workaround.patch
-PATCHFILES_isa-i386-version-2.8.10 = 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch
-PATCHFILES_isa-i386-version-2.8.10 += 0002-Fixing-retarded-checks-for-libGL.patch
-PATCHFILES_isa-i386-version-2.8.10 += 0003-vsscanf-support-via-ncursesw.patch
-PATCHFILES_isa-i386-version-2.8.10 += 0005-stupid-vwscanf-workaround.patch
-PATCHFILES_isa-sparcv8-version-2.8.10 = 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch
-PATCHFILES_isa-sparcv8-version-2.8.10 += 0002-Fixing-retarded-checks-for-libGL.patch
-PATCHFILES_isa-sparcv8-version-2.8.10 += 0003-vsscanf-support-via-ncursesw.patch
-PATCHFILES_isa-sparcv8-version-2.8.10 += 0005-stupid-vwscanf-workaround.patch
-PACKAGES = CSWwxwidgetscommon
-PACKAGES += CSWwxwidgetsdevel
+PACKAGES = CSWwxwidgets
+PACKAGES += CSWwxwidgets-dev
PACKAGES += CSWwxwidgetsgtk2
-SPKG_DESC_CSWwxwidgetscommon = A cross-platform toolkit, common files
-SPKG_DESC_CSWwxwidgetsdevel = A cross-platform toolkit, header files
-SPKG_DESC_CSWwxwidgetsgtk2 = A cross-platform toolkit, gtk2 support
-RUNTIME_DEP_PKGS_CSWwxwidgetscommon += CSWexpat
-RUNTIME_DEP_PKGS_CSWwxwidgetscommon += CSWiconv
-RUNTIME_DEP_PKGS_CSWwxwidgetscommon += CSWlibxext
-RUNTIME_DEP_PKGS_CSWwxwidgetscommon += CSWncurses
-RUNTIME_DEP_PKGS_CSWwxwidgetscommon += CSWsunmath
-RUNTIME_DEP_PKGS_CSWwxwidgetscommon += CSWzlib
-RUNTIME_DEP_PKGS_CSWwxwidgetsdevel += CSWexpat
-RUNTIME_DEP_PKGS_CSWwxwidgetsdevel += CSWiconv
-RUNTIME_DEP_PKGS_CSWwxwidgetsdevel += CSWlibxext
-RUNTIME_DEP_PKGS_CSWwxwidgetsdevel += CSWncurses
-RUNTIME_DEP_PKGS_CSWwxwidgetsdevel += CSWsunmath
-RUNTIME_DEP_PKGS_CSWwxwidgetsdevel += CSWzlib
-RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWexpat
-RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWfconfig
-RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWftype2
-RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWggettextrt
-RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWglib2
-RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWgtk2
-RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWiconv
-RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWjpeg
-RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibatk
-RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibsm
-RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibxext
+SPKG_DESC_CSWwxwidgets = A cross-platform toolkit
+SPKG_DESC_CSWwxwidgets-dev = A cross-platform toolkit, header files
+SPKG_DESC_CSWwxwidgetsgtk2 = A cross-platform toolkit, gtk2 support
+
+RUNTIME_DEP_PKGS_CSWwxwidgets += CSWlibexpat1
+RUNTIME_DEP_PKGS_CSWwxwidgets += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWwxwidgets += CSWlibz1
+
+RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWexpat
+RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWiconv
+RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWncurses
+RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWzlib
+
+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 += CSWlibtiff3
+RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibglib2-0-0
RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWmesa
-RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWncurses
RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWpango
-RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWpng
-RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWsunmath
-RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWtiff
-RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWzlib
-
# Dependencies between wxwidgets subpackages
-RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWwxwidgetscommon
-RUNTIME_DEP_PKGS_CSWwxwidgetsdevel += CSWwxwidgetscommon CSWwxwidgetsgtk2
+RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWwxwidgets
+RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWwxwidgets CSWwxwidgetsgtk2
+
BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS)
-BUILD_DEP_PKGS += CSWgtk2devel
-BUILD_DEP_PKGS += CSWlibpthreadstubs
-BUILD_DEP_PKGS += CSWxproto
-BUILD_DEP_PKGS += CSWkbproto
-BUILD_DEP_PKGS += CSWlibxcb
-BUILD_DEP_PKGS += CSWlibxcbdevel
-BUILD_DEP_PKGS += CSWlibxau
-# BUILD_DEP_PKGS += CSWlibxaudevel
-BUILD_DEP_PKGS += CSWlibxrenderdevel
-# BUILD_DEP_PKGS += CSWrenderproto
-BUILD_DEP_PKGS += SUNWxwinc
+BUILD_DEP_PKGS += CSWintltool
+BUILD_DEP_PKGS += CSWpkgconfig
+BUILD_DEP_PKGS += CSWlibgtk2-dev
+BUILD_DEP_PKGS += CSWlibpcre-dev
+BUILD_DEP_PKGS += CSWfontconfig-dev
+BUILD_DEP_PKGS += CSWlibfreetype-dev
+BUILD_DEP_PKGS += CSWlibpng-dev
+BUILD_DEP_PKGS += CSWsunx11devel
+BUILD_DEP_PKGS += CSWlibiconv-dev
+BUILD_DEP_PKGS += CSWggettext-dev
+BUILD_DEP_PKGS += CSWlibexpat-dev
-PKGFILES_CSWwxwidgetsdevel = $(PKGFILES_DEVEL)
-PKGFILES_CSWwxwidgetsdevel += /opt/csw/bin/wx-config
-PKGFILES_CSWwxwidgetsdevel += /opt/csw/share/bakefile/presets.*
-PKGFILES_CSWwxwidgetsdevel += /opt/csw/share/aclocal.*
-PKGFILES_CSWwxwidgetsdevel += /opt/csw/bin/wx-config
-PKGFILES_CSWwxwidgetsdevel += /opt/csw/bin/wxrc=wxrc-2.8
-PKGFILES_CSWwxwidgetsdevel += /opt/csw/bin/wxrc-2.8
-PKGFILES_CSWwxwidgetsdevel += /opt/csw/lib/wx/config.*
-PKGFILES_CSWwxwidgetsdevel += /opt/csw/lib/wx/include.*
-PKGFILES_CSWwxwidgetsgtk2 = /opt/csw/lib/wx/(include|config)/gtk2-.*
-PKGFILES_CSWwxwidgetsgtk2 += /opt/csw/lib/libwx_gtk2.*
-PKGFILES_CSWwxwidgetsgtk2 += /opt/csw/bin/wx(-config|rc(|-2.8))
+PKGFILES_CSWwxwidgets = $(libdir).*libwx_base.*\.so\..*
+PKGFILES_CSWwxwidgets += $(sharedir)/locale.*
-CATALOGNAME_CSWwxwidgetscommon = wxwidgets_common
-CATALOGNAME_CSWwxwidgetsdevel = wxwidgets_devel
-CATALOGNAME_CSWwxwidgetsgtk2 = wxwidgets_gtk2
+PKGFILES_CSWwxwidgetsgtk2 = $(libdir).*libwx_gtk2.*\.so\..*
+
+PKGFILES_CSWwxwidgets-dev = $(PKGFILES_DEVEL)
+
+CATALOGNAME_CSWwxwidgets = wxwidgets
+CATALOGNAME_CSWwxwidgets-dev = wxwidgets_dev
+CATALOGNAME_CSWwxwidgetsgtk2 = wxwidgetsgtk2
+
+OBSOLETED_BY_CSWwxwidgets = CSWwxwidgetscommon
+OBSOLETED_BY_CSWwxwidgets-dev = CSWwxwidgetsdevel
+
TEST_SCRIPTS =
-# To fix a problem with unresolved symbols
-EXTRA_LINKER_FLAGS = /usr/openwin/lib/libXext.so
-# For vsscanf support
-# EXTRA_LINKER_FLAGS += /opt/csw/lib/libncursesw.so
-EXTRA_LINKER_FLAGS += -lncursesw
-# To fix the __sincos problem on x86
-EXTRA_LINKER_FLAGS += -lsunmath
+BUILD64 = 1
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --with-gtk=2
@@ -152,33 +99,63 @@
CONFIGURE_ARGS += --with-regex
CONFIGURE_ARGS += --with-opengl
CONFIGURE_ARGS += --enable-unicode
-EXTRA_CFLAGS = -fast -xstrconst -xnolibmopt -D__EXTENSIONS__
-EXTRA_CXXFLAGS = -fast -xstrconst -xnolibmopt -D__EXTENSIONS__
-EXTRA_INC = /opt/csw/X11/include /usr/X11/include /usr/openwin/share/include
-EXTRA_LIB = /opt/csw/X11/lib
-EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
+CONFIGURE_ARGS += --enable-printarch=no
+CONFIGURE_ARGS += --with-gnomeprint=no
-# The 2.8.5 version has been compiled as a monolithic library. Building it the
-# same way for backwards compatibility.
-CONFIGURE_ARGS_version-2.8.5 = --enable-monolithic
-CONFIGURE_ARGS += $(CONFIGURE_ARGS_version-$(VERSION))
+# -norunpath is needed for LDFLAGS as CC is used as linker. Not cc, so no
+# problem with it being a C++compiler parameter
+EXTRA_CFLAGS += -xnorunpath
+EXTRA_CXXFLAGS += -norunpath
+EXTRA_LDFLAGS += -norunpath
+EXTRA_LD_OPTIONS += -z nolazyload -B direct
-INSTALL_SCRIPTS = wxwidgets
+# wxWidget contains a bunch of .so, let's keep them together as one big
+# happy family
+CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libwx_gtk2u_aui-2.8.so.0|soname=libwx_gtk2u_aui-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-aui2-8-0
+CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libwx_gtk2u_richtext-2.8.so.0|soname=libwx_gtk2u_richtext-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-richtext2-8-0
+CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libwx_gtk2u_adv-2.8.so.0|soname=libwx_gtk2u_adv-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-adv2-8-0
+CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libwx_gtk2u_core-2.8.so.0|soname=libwx_gtk2u_core-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-core2-8-0
+CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libwx_gtk2u_gl-2.8.so.0|soname=libwx_gtk2u_gl-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-gl2-8-0
+CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libwx_gtk2u_html-2.8.so.0|soname=libwx_gtk2u_html-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-html2-8-0
+CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libwx_gtk2u_qa-2.8.so.0|soname=libwx_gtk2u_qa-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-qa2-8-0
+CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libwx_gtk2u_xrc-2.8.so.0|soname=libwx_gtk2u_xrc-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-xrc2-8-0
+CHECKPKG_OVERRIDES_CSWwxwidgets += shared-lib-pkgname-mismatch|file=opt/csw/lib/libwx_baseu-2.8.so.0|soname=libwx_baseu-2.8.so.0|pkgname=CSWwxwidgets|expected=CSWlibwx-baseu2-8-0
+CHECKPKG_OVERRIDES_CSWwxwidgets += shared-lib-pkgname-mismatch|file=opt/csw/lib/libwx_baseu_net-2.8.so.0|soname=libwx_baseu_net-2.8.so.0|pkgname=CSWwxwidgets|expected=CSWlibwx-baseu-net2-8-0
+CHECKPKG_OVERRIDES_CSWwxwidgets += shared-lib-pkgname-mismatch|file=opt/csw/lib/libwx_baseu_xml-2.8.so.0|soname=libwx_baseu_xml-2.8.so.0|pkgname=CSWwxwidgets|expected=CSWlibwx-baseu-xml2-8-0
+CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2_i386 += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libwx_gtk2u_aui-2.8.so.0|soname=libwx_gtk2u_aui-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-aui2-8-0
+CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2_i386 += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libwx_gtk2u_richtext-2.8.so.0|soname=libwx_gtk2u_richtext-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-richtext2-8-0
+CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2_i386 += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libwx_gtk2u_adv-2.8.so.0|soname=libwx_gtk2u_adv-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-adv2-8-0
+CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2_i386 += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libwx_gtk2u_core-2.8.so.0|soname=libwx_gtk2u_core-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-core2-8-0
+CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2_i386 += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libwx_gtk2u_gl-2.8.so.0|soname=libwx_gtk2u_gl-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-gl2-8-0
+CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2_i386 += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libwx_gtk2u_html-2.8.so.0|soname=libwx_gtk2u_html-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-html2-8-0
+CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2_i386 += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libwx_gtk2u_qa-2.8.so.0|soname=libwx_gtk2u_qa-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-qa2-8-0
+CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2_i386 += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libwx_gtk2u_xrc-2.8.so.0|soname=libwx_gtk2u_xrc-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-xrc2-8-0
+CHECKPKG_OVERRIDES_CSWwxwidgets_i386 += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libwx_baseu-2.8.so.0|soname=libwx_baseu-2.8.so.0|pkgname=CSWwxwidgets|expected=CSWlibwx-baseu2-8-0
+CHECKPKG_OVERRIDES_CSWwxwidgets_i386 += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libwx_baseu_net-2.8.so.0|soname=libwx_baseu_net-2.8.so.0|pkgname=CSWwxwidgets|expected=CSWlibwx-baseu-net2-8-0
+CHECKPKG_OVERRIDES_CSWwxwidgets_i386 += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libwx_baseu_xml-2.8.so.0|soname=libwx_baseu_xml-2.8.so.0|pkgname=CSWwxwidgets|expected=CSWlibwx-baseu-xml2-8-0
+
+CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2_sparc += shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv9/libwx_gtk2u_aui-2.8.so.0|soname=libwx_gtk2u_aui-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-aui2-8-0
+CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2_sparc += shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv9/libwx_gtk2u_richtext-2.8.so.0|soname=libwx_gtk2u_richtext-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-richtext2-8-0
+CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2_sparc += shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv9/libwx_gtk2u_adv-2.8.so.0|soname=libwx_gtk2u_adv-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-adv2-8-0
+CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2_sparc += shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv9/libwx_gtk2u_core-2.8.so.0|soname=libwx_gtk2u_core-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-core2-8-0
+CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2_sparc += shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv9/libwx_gtk2u_gl-2.8.so.0|soname=libwx_gtk2u_gl-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-gl2-8-0
+CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2_sparc += shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv9/libwx_gtk2u_html-2.8.so.0|soname=libwx_gtk2u_html-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-html2-8-0
+CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2 += shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv9/libwx_gtk2u_qa-2.8.so.0|soname=libwx_gtk2u_qa-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-qa2-8-0
+CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2_sparc += shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv9/libwx_gtk2u_xrc-2.8.so.0|soname=libwx_gtk2u_xrc-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-xrc2-8-0
+CHECKPKG_OVERRIDES_CSWwxwidgets_sparc += shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv9/libwx_baseu-2.8.so.0|soname=libwx_baseu-2.8.so.0|pkgname=CSWwxwidgets|expected=CSWlibwx-baseu2-8-0
+CHECKPKG_OVERRIDES_CSWwxwidgets_sparc += shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv9/libwx_baseu_net-2.8.so.0|soname=libwx_baseu_net-2.8.so.0|pkgname=CSWwxwidgets|expected=CSWlibwx-baseu-net2-8-0
+CHECKPKG_OVERRIDES_CSWwxwidgets_sparc += shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv9/libwx_baseu_xml-2.8.so.0|soname=libwx_baseu_xml-2.8.so.0|pkgname=CSWwxwidgets|expected=CSWlibwx-baseu-xml2-8-0
+
+CHECKPKG_OVERRIDES_CSWwxwidgets += $(CHECKPKG_OVERRIDES_CSWwxwidgets_$(GARCH))
+CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2 += $(CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2_$(GARCH))
+
+# 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
+
LICENSE = docs/licence.txt
include gar/category.mk
-install-wxwidgets:
- (cd $(WORKSRC); $(INSTALL_ENV) gmake DESTDIR=$(DESTDIR) install)
- (cd $(WORKSRC)/contrib; $(INSTALL_ENV) gmake DESTDIR=$(DESTDIR) install)
- @$(MAKECOOKIE)
-
-post-merge:
- ginstall -m 755 \
- $(FILEDIR)/libwx_gtk2u-2.8.so.0.2.0-$(GARCH) \
- $(PKGROOT)$(libdir)/libwx_gtk2u-2.8.so.0.2.0
- ginstall -m 755 \
- $(FILEDIR)/libwx_gtk2u_gl-2.8.so.0.2.0-$(GARCH) \
- $(PKGROOT)$(libdir)/libwx_gtk2u_gl-2.8.so.0.2.0
- @$(MAKECOOKIE)
Modified: csw/mgar/pkg/wxwidgets/trunk/checksums
===================================================================
--- csw/mgar/pkg/wxwidgets/trunk/checksums 2013-06-08 20:01:58 UTC (rev 21309)
+++ csw/mgar/pkg/wxwidgets/trunk/checksums 2013-06-09 20:04:40 UTC (rev 21310)
@@ -1,9 +1 @@
-7830ab8006ade9b14567341b5481eadd 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch
-45df2933ed2fa53f229feda01467db81 0002-Fixing-retarded-checks-for-libGL.patch
-225f6163a1c31d1f96a3b0548b338105 0003-vsscanf-support-via-ncursesw.patch
-969c363847e675dc4d3ad6b8871b96db 0005-stupid-vwscanf-workaround.patch
-d4a33d7a1a30965edf15b54bfb011174 libwx_gtk2u-2.8.so.0.2.0-i386
-6a5857bca9695738ba5e185aac4d26e7 libwx_gtk2u-2.8.so.0.2.0-sparc
-9f2495b8a4b9b91998a74164efc9ca3a libwx_gtk2u_gl-2.8.so.0.2.0-i386
-5870955c6c23ec655c17b4da92548207 libwx_gtk2u_gl-2.8.so.0.2.0-sparc
-05b32ca051651f4b1885a90f62969faf wxWidgets-2.8.10.tar.gz
+4103e37e277abeb8aee607b990c215c4 wxWidgets-2.8.12.tar.bz2
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