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

lblume at users.sourceforge.net lblume at users.sourceforge.net
Thu May 26 16:54:09 CEST 2016


Revision: 25728
          http://sourceforge.net/p/gar/code/25728
Author:   lblume
Date:     2016-05-26 14:54:09 +0000 (Thu, 26 May 2016)
Log Message:
-----------
wxwidgets/trunk: Bump to 3.1.0; switch to GCC5; switch to GitHub

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	2016-05-26 11:31:44 UTC (rev 25727)
+++ csw/mgar/pkg/wxwidgets/trunk/Makefile	2016-05-26 14:54:09 UTC (rev 25728)
@@ -3,7 +3,7 @@
 # $Id$
 
 NAME    = wxWidgets
-VERSION = 2.8.12
+VERSION = 3.1.0
 GARTYPE = v2
 define BLURB
   wxWidgets lets developers create applications for Win32, Mac OS X, GTK+, X11,
@@ -16,10 +16,11 @@
 DISTFILES  = $(NAME)-$(VERSION).tar.bz2
 
 VENDOR_URL   = http://www.wxwidgets.org/
-MASTER_SITES = $(SF_MIRRORS)
+GITHUB_USER  = $(NAME)
+MASTER_SITES = $(GITHUB_MIRROR)
 SF_PROJECT   = wxwindows
 
-PATCHFILES += 0006-configure-gnome-print-headers.patch
+GARCOMPILER=GCC5
 
 PACKAGES  = CSWwxwidgets
 PACKAGES += CSWwxwidgets-dev
@@ -99,7 +100,6 @@
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-gtk=2
-CONFIGURE_ARGS += --with-gtk-prefix=/opt/csw
 CONFIGURE_ARGS += --with-regex
 CONFIGURE_ARGS += --with-opengl
 CONFIGURE_ARGS += --enable-unicode
@@ -108,10 +108,10 @@
 
 # -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 -z ignore -Bdirect -lCrun -lCstd
+#EXTRA_CFLAGS     += -xnorunpath
+#EXTRA_CXXFLAGS   += -norunpath
+#EXTRA_LDFLAGS    += -norunpath
+#EXTRA_LD_OPTIONS += -z nolazyload -z ignore -Bdirect -lCrun -lCstd
 
 # wxWidget contains a bunch of .so, let's keep them together as one big
 # happy family
@@ -131,21 +131,7 @@
 
 include gar/category.mk
 
-# It is necessary to use this as the contrib subdirectory is not installed
-# by default
 install-wxwidgets:
 	(cd $(WORKSRC) && $(INSTALL_ENV) gmake DESTDIR=$(DESTDIR) install)
-	(cd $(WORKSRC)/contrib && $(INSTALL_ENV) gmake DESTDIR=$(DESTDIR) install)
 	@$(MAKECOOKIE)
 
-# Remove Studio-specific arch references
-post-install-modulated:
-	gsed -i \
-		-e '/^[^#]/s/-xO3[^ ]* //' \
-		-e '/^[^#]/s/-xarch=[^ ]* //' \
-		-e '/^[^#]/s/-xchip=[^ ]* //' \
-		-e '/^[^#]/s/-norunpath[^ ]* //' \
-		-e '/^[^#]/s/-lCrun[^ ]* //' \
-		-e '/^[^#]/s/-lCstd[^ ]* //' \
-		$(DESTDIR)$(libdir)/wx/config/gtk2-unicode-release-2.8
-

Modified: csw/mgar/pkg/wxwidgets/trunk/checksums
===================================================================
--- csw/mgar/pkg/wxwidgets/trunk/checksums	2016-05-26 11:31:44 UTC (rev 25727)
+++ csw/mgar/pkg/wxwidgets/trunk/checksums	2016-05-26 14:54:09 UTC (rev 25728)
@@ -1 +1 @@
-4103e37e277abeb8aee607b990c215c4  wxWidgets-2.8.12.tar.bz2
+e20c14bb9bf5d4ec0979a3cd7510dece  wxWidgets-3.1.0.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