diff options
author | wiz <wiz@pkgsrc.org> | 2017-09-11 20:22:53 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2017-09-11 20:22:53 +0000 |
commit | a9d6e358b720f58af81ab8d41c532817241d1ba8 (patch) | |
tree | 232187ab549ffbcf109a8567b2c1cb72654de73d /x11 | |
parent | 68472dc1c46e86e908145658e6dbda88b74ebf03 (diff) | |
download | pkgsrc-a9d6e358b720f58af81ab8d41c532817241d1ba8.tar.gz |
Updated wxGTK30 to 3.0.3.
Carry forward libtool patch from 3.0.2, with LDFLAGS changes
included.
This is a bug fix release with no significant new features compared
to the previous 3.0.x releases and compatible with them at both the
API and the ABI level (i.e. all applications linked against earlier
3.0.x DLLs or shared libraries will continue to work when using
3.0.3 libraries).
The full list of changes in this release is available at
https://raw.githubusercontent.com/wxWidgets/wxWidgets/v3.0.3/docs/changes.txt
(starting from the line 583, or search for "3.0.3" in this file),
here are some selected ones:
* In all ports:
- Support requestion modern (3.x+) OpenGL version in wxGLCanvas.
- Fix using wxHTTP and wxFTP from worker thread.
* In wxGTK:
- Support for Gstreamer 1.0 in wxMediaCtrl, in addition to obsolete 0.x.
- Several fatal bug fixes for GTK+ 3.
Diffstat (limited to 'x11')
-rw-r--r-- | x11/wxGTK30/Makefile | 22 | ||||
-rw-r--r-- | x11/wxGTK30/distinfo | 20 | ||||
-rw-r--r-- | x11/wxGTK30/patches/patch-Makefile.in | 32 | ||||
-rw-r--r-- | x11/wxGTK30/patches/patch-src_stc_scintilla_src_Editor.cxx | 17 |
4 files changed, 20 insertions, 71 deletions
diff --git a/x11/wxGTK30/Makefile b/x11/wxGTK30/Makefile index 26345637325..279c0aa8365 100644 --- a/x11/wxGTK30/Makefile +++ b/x11/wxGTK30/Makefile @@ -1,20 +1,20 @@ -# $NetBSD: Makefile,v 1.21 2017/07/15 19:10:31 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2017/09/11 20:22:53 wiz Exp $ -VERSION= 3.0.2 -PKGREVISION= 10 -DISTNAME= wxWidgets-${VERSION} -PKGNAME= wxGTK30-${VERSION} +DISTNAME= wxWidgets-3.0.3 +PKGNAME= ${DISTNAME:S/wxWidgets/wxGTK30/} CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wxwindows/} +MASTER_SITES= ${MASTER_SITE_GITHUB:=wxWidgets/} +GITHUB_PROJECT= wxWidgets +GITHUB_RELEASE= v${PKGVERSION_NOREV} EXTRACT_SUFX= .tar.bz2 -PATCHFILES= ${DISTNAME}-libtool.3.diff.bz2 +PATCHFILES= ${DISTNAME}-libtool.1.diff.bz2 PATCH_SITES= ${MASTER_SITE_LOCAL} -PATCH_DIST_STRIP.${DISTNAME}-libtool.3.diff.bz2= -p1 +PATCH_DIST_STRIP.${DISTNAME}-libtool.1.diff.bz2= -p1 MAINTAINER= dbj@NetBSD.org HOMEPAGE= http://www.wxwidgets.org/ -COMMENT= wxWidgets GUI library +COMMENT= Cross-platform wxWidgets GUI library # LGPLv2 with additional permission; http://opensource.org/licenses/wxwindows LICENSE= gnu-lgpl-v2 @@ -106,8 +106,8 @@ post-install: .include "../../mk/jpeg.buildlink3.mk" .include "../../mk/oss.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" -.include "../../multimedia/gstreamer0.10/buildlink3.mk" -.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" +.include "../../multimedia/gstreamer1/buildlink3.mk" +.include "../../multimedia/gst-plugins1-base/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" .if ${OPSYS} != "Darwin" .include "../../graphics/MesaLib/buildlink3.mk" diff --git a/x11/wxGTK30/distinfo b/x11/wxGTK30/distinfo index b31506d5bbc..5a38eb8e640 100644 --- a/x11/wxGTK30/distinfo +++ b/x11/wxGTK30/distinfo @@ -1,18 +1,16 @@ -$NetBSD: distinfo,v 1.8 2017/07/15 19:10:57 wiz Exp $ +$NetBSD: distinfo,v 1.9 2017/09/11 20:22:53 wiz Exp $ -SHA1 (wxWidgets-3.0.2-libtool.3.diff.bz2) = ffc3fbec9b1a8a9c19ac5f3750c78559b6bb2c81 -RMD160 (wxWidgets-3.0.2-libtool.3.diff.bz2) = 54f4aa932208172496e620def1d854602d87b12e -SHA512 (wxWidgets-3.0.2-libtool.3.diff.bz2) = 31ea745d9d989e20fcb16e152c5312080d4eca5da9c2b27bf1a9ce7c8d40479711959bce3e33e6d3f10116c85a00e8f0b0b5699633966ebaf5afb418e69e6488 -Size (wxWidgets-3.0.2-libtool.3.diff.bz2) = 209972 bytes -SHA1 (wxWidgets-3.0.2.tar.bz2) = 6461eab4428c0a8b9e41781b8787510484dea800 -RMD160 (wxWidgets-3.0.2.tar.bz2) = a7f404c8a64ca68fa31e408bded4387c2722196b -SHA512 (wxWidgets-3.0.2.tar.bz2) = 098f79863103f3be0b7e21e4f0f1b34ab5277ef0033c1ef1387a9c673b0e0b76a2d732b183fa11b22cfcbbfdb7a4884f243d12f65cd49baa1772852307b393c4 -Size (wxWidgets-3.0.2.tar.bz2) = 20172909 bytes -SHA1 (patch-Makefile.in) = 57f775d5471411a5439c83c943042badc153e00f +SHA1 (wxWidgets-3.0.3-libtool.1.diff.bz2) = 7e108d1d58efc23354f5ac8ebe7e0f5938df6f51 +RMD160 (wxWidgets-3.0.3-libtool.1.diff.bz2) = 9a165c89abbe857c042a936a54a5fdf21737ba33 +SHA512 (wxWidgets-3.0.3-libtool.1.diff.bz2) = f7659bb6b2d3262399a6c5eaa4fe16c1204ec80addbfacf5e64052fe2a793f63dc071d7c261252db93556e86e55a2da939875a6f83ff2b1b09fd7d41636f65b3 +Size (wxWidgets-3.0.3-libtool.1.diff.bz2) = 213915 bytes +SHA1 (wxWidgets-3.0.3.tar.bz2) = 3525306c926e208d9b0272aaa9c091b8c7264e5b +RMD160 (wxWidgets-3.0.3.tar.bz2) = a74969aba91793ce3c870ca966234b6f3cf74403 +SHA512 (wxWidgets-3.0.3.tar.bz2) = dfe53682d7cda1d460f336a890603c4e823078be4b05e7cf43ab36cb49247f702808aa939d9311705bdf5f96eaa076e7a8f77f4415bc07c5bfdc19e5deff1dd1 +Size (wxWidgets-3.0.3.tar.bz2) = 20054446 bytes SHA1 (patch-build_aclocal_bakefile.m4) = 7d3d6fb1e6a72e370dc6147010fa5bf2c46f1206 SHA1 (patch-configure) = 897f13daa5bc8246902d7d864096d621f2e54928 SHA1 (patch-configure.in) = e49b9a83040201f01c22b3e1cbc4b331985f4e99 -SHA1 (patch-src_stc_scintilla_src_Editor.cxx) = 0b3fb6b8a6c3e72868a12d7b16ceebe295a599a8 SHA1 (patch-src_tiff_configure) = e1c002f5b7d0bf2c0bec399dbb62d0146c14ec20 SHA1 (patch-src_tiff_configure.ac) = 0d51a7c251f897aa00e58c3a7ec5f348b50d1821 SHA1 (patch-src_unix_fswatcher__kqueue.cpp) = 49e142dbdd5c8b8f449ab19b4adbe403d515ab95 diff --git a/x11/wxGTK30/patches/patch-Makefile.in b/x11/wxGTK30/patches/patch-Makefile.in deleted file mode 100644 index 8d11bd35b51..00000000000 --- a/x11/wxGTK30/patches/patch-Makefile.in +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-Makefile.in,v 1.1 2017/07/15 19:10:57 wiz Exp $ - -Honor LDFLAGS. - ---- Makefile.in.orig 2017-07-15 18:18:47.610399130 +0000 -+++ Makefile.in -@@ -35,6 +35,7 @@ CC = @CC@ - CXX = @CXX@ - CFLAGS = @CFLAGS@ - CXXFLAGS = @CXXFLAGS@ -+LDFLAGS = @LDFLAGS@ - OBJCXXFLAGS = @OBJCXXFLAGS@ - CPPFLAGS = @CPPFLAGS@ - VENDOR = @VENDOR@ -@@ -65,7 +66,7 @@ WX_RELEASE_NODOT = 30 - WX_VERSION = $(WX_RELEASE).2 - LIBDIRNAME = $(wx_top_builddir)/lib - WXREGEX_CFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(PIC_FLAG) \ -- $(CPPFLAGS) $(CFLAGS) -+ $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) - WXREGEX_OBJECTS = \ - wxregex_regcomp.lo \ - wxregex_regexec.lo \ -@@ -14890,7 +14891,7 @@ distclean: clean - -(cd samples && $(MAKE) distclean) - - @COND_wxUSE_REGEX_builtin@$(LIBDIRNAME)/$(DLLPREFIX)wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE).la: $(WXREGEX_OBJECTS) --@COND_wxUSE_REGEX_builtin@ ${LIBTOOL} --mode=link --tag=CC $(CC) -rpath $(libdir) -shared -o $@ $(WXREGEX_OBJECTS) $(__wxregex___importlib) -version-number 0:2:0 -+@COND_wxUSE_REGEX_builtin@ ${LIBTOOL} --mode=link --tag=CC $(CC) $(LDFLAGS) -rpath $(libdir) -shared -o $@ $(WXREGEX_OBJECTS) $(__wxregex___importlib) -version-number 0:2:0 - - @COND_wxUSE_REGEX_builtin@install_wxregex: $(__wxregex___depname) - @COND_wxUSE_REGEX_builtin@ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(libdir) diff --git a/x11/wxGTK30/patches/patch-src_stc_scintilla_src_Editor.cxx b/x11/wxGTK30/patches/patch-src_stc_scintilla_src_Editor.cxx deleted file mode 100644 index b02803289d2..00000000000 --- a/x11/wxGTK30/patches/patch-src_stc_scintilla_src_Editor.cxx +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-src_stc_scintilla_src_Editor.cxx,v 1.1 2015/01/17 11:16:59 wiedi Exp $ -Avoid ambiguity on SunOS - ---- src/stc/scintilla/src/Editor.cxx.orig 2014-10-06 21:33:44.000000000 +0000 -+++ src/stc/scintilla/src/Editor.cxx -@@ -5841,9 +5841,9 @@ void Editor::GoToLine(int lineNo) { - } - - static bool Close(Point pt1, Point pt2) { -- if (abs(pt1.x - pt2.x) > 3) -+ if (abs((long)(pt1.x - pt2.x)) > 3) - return false; -- if (abs(pt1.y - pt2.y) > 3) -+ if (abs((long)(pt1.y - pt2.y)) > 3) - return false; - return true; - } |