Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2016Q3

Browse Source
This commit is contained in:
sambuc
2016-11-18 22:39:22 +01:00
committed by sambuc
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949747 additions and 377081 deletions
Download Patch File Download Diff File Expand all files Collapse all files
x11/qt4-libs/Makefile
+5 -1
View File
@@ -1,6 +1,7 @@
# $NetBSD: Makefile,v 1.108 2015/07/18 11:11:53 adam Exp $
# $NetBSD: Makefile,v 1.113 2016/08/03 10:23:37 adam Exp $
PKGNAME= qt4-libs-${QTVERSION}
PKGREVISION= 4
COMMENT= C++ X GUI toolkit
.include "../../x11/qt4-libs/Makefile.common"
@@ -25,6 +26,8 @@ CONFIGURE_ARGS+= -no-sql-sqlite
# kdelibs4 requires openssl support!
CONFIGURE_ARGS+= -openssl-linked
CONFIGURE_ARGS+= -iconv
.include "../../mk/compiler.mk"
.if !empty(PKGSRC_COMPILER:Mclang)
CXXFLAGS+= -std=c++11 -Wno-c++11-narrowing
@@ -150,6 +153,7 @@ do-install:
.include "../../x11/libXrandr/buildlink3.mk"
.endif
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../fonts/fontconfig/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
x11/qt4-libs/Makefile.common
+1 -2
View File
@@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.40 2015/07/04 16:18:42 joerg Exp $
# $NetBSD: Makefile.common,v 1.41 2016/02/25 08:27:05 jperkin Exp $
# used by x11/qt4-docs/Makefile
# used by x11/qt4-libs/Makefile
# used by x11/qt4-mng/Makefile
@@ -38,7 +38,6 @@ CONFIGURE_ARGS+= -prefix "${QTPREFIX}"
CONFIGURE_ARGS+= ${CFLAGS:M-I*} ${LDFLAGS:M-L*} ${LDFLAGS:M-l*}
CONFIGURE_ARGS+= -opensource -confirm-license
CONFIGURE_ARGS+= -sysconfdir "${PKG_SYSCONFDIR}/xdg"
OPSYSVARS+= CONFIGURE_ARGS
.include "../../mk/bsd.prefs.mk"
x11/qt4-libs/buildlink3.mk
+3 -2
View File
@@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.43 2015/04/25 14:25:16 tnn Exp $
# $NetBSD: buildlink3.mk,v 1.45 2016/03/05 11:27:59 jperkin Exp $
BUILDLINK_TREE+= qt4-libs
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= qt4-libs
QT4_LIBS_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.qt4-libs+= qt4-libs>=4.6.1nb2
BUILDLINK_ABI_DEPENDS.qt4-libs+= qt4-libs>=4.8.6nb5
BUILDLINK_ABI_DEPENDS.qt4-libs+= qt4-libs>=4.8.7nb1
BUILDLINK_PKGSRCDIR.qt4-libs?= ../../x11/qt4-libs
BUILDLINK_INCDIRS.qt4-libs+= qt4/include
@@ -18,6 +18,7 @@ PTHREAD_OPTS+= require
.include "../../mk/bsd.fast.prefs.mk"
.include "../../converters/libiconv/buildlink3.mk"
.include "../../fonts/fontconfig/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../mk/jpeg.buildlink3.mk"
x11/qt4-libs/distinfo
+6 -2
View File
@@ -1,7 +1,8 @@
$NetBSD: distinfo,v 1.103 2015/08/30 10:04:08 markd Exp $
$NetBSD: distinfo,v 1.110 2016/08/30 07:58:27 richard Exp $
SHA1 (qt-everywhere-opensource-src-4.8.7.tar.gz) = 76aef40335c0701e5be7bb3a9101df5d22fe3666
RMD160 (qt-everywhere-opensource-src-4.8.7.tar.gz) = afb5e5a99388e6429faca59cb5000054feffd166
SHA512 (qt-everywhere-opensource-src-4.8.7.tar.gz) = f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
Size (qt-everywhere-opensource-src-4.8.7.tar.gz) = 241075567 bytes
SHA1 (patch-aa) = 9b5f8bd980d8c3f38fd3c541380fd42d2a93a609
SHA1 (patch-ab) = 447a888cbc784a54935f23d1005d6977374a484d
@@ -56,6 +57,7 @@ SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Atomics.h) = c79d9ed7f
SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_HashSet.h) = 25654a9f2cedb17b5f536b324e47d56eb4010029
SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_MathExtras.h) = 68152f0077ec5bcce1b3774aaac64af5fd9e491e
SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_NullPtr.h) = 3c1dbd49e236669fe9849918e571eed58980421b
SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Platform.h) = 8f398aebc6d1b380c271489248efd92a35c7e23d
SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_RefCountedLeakCounter.h) = fc4686c018471fcae375d9382737e0844a0f45a8
SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_StringImpl.h) = d5460bede6b3662df4d9dbec5826db98c6ef4f61
SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_ThreadSafeRefCounted.h) = 2d3176beb56697d033387ab10729cfb6681d01c7
@@ -66,9 +68,11 @@ SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_MediaPlayer.cpp
SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_filters_arm_FEGaussianBlurNEON.cpp) = 51b6bddf81978fd7ae6580132a74aeaec84b724f
SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_filters_arm_FELightingNEON.cpp) = a0a3d9d066aa6ae3c42cee198287b10e46e7f25d
SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_qt_PlatformKeyboardEventQt.cpp) = b28cf71983f8e71b82b1c634a10b3898ca13ede5
SHA1 (patch-src_3rdparty_webkit_Source_WebKit2_DerivedSources.pro) = 7ae5feb79efd0836b74000e183b96f5775fd3043
SHA1 (patch-src_corelib_io_io.pri) = cde98927b524c92fae1e053c2359e77bde2c240a
SHA1 (patch-src_corelib_io_qfilesystemwatcher.cpp) = bb16b95d20286b1aa069dc25843d7e0067cc0268
SHA1 (patch-src_corelib_thread_qthread__unix.cpp) = 1d2104fb43f6789729b5bb88191fa5fa4d4184b1
SHA1 (patch-src_corelib_thread_qthread__unix.cpp) = 67fbdc29d6da0aa7309a7aeb653a5abf10bd4d78
SHA1 (patch-src_gui_painting_qpaintengine__mac.cpp) = dc44116d5d138020e5d525ec5b7fd0f1b44ebeca
SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols.cpp) = 3ad682b86d2e9bd2b282caa298508dc3e9dd8566
SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols__p.h) = 417846ba9edab8638cafa41a54ef60029467ef80
SHA1 (patch-src_plugins_accessible_widgets_itemviews.cpp) = 1456fbaacef33f3b2422158d758d02990845048a
x11/qt4-libs/options.mk
+1 -1
View File
@@ -1,4 +1,4 @@
# $NetBSD: options.mk,v 1.6 2014/06/18 09:26:12 wiz Exp $
# $NetBSD: options.mk,v 1.8 2016/08/30 08:00:14 richard Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.qt4
PKG_SUPPORTED_OPTIONS= cups debug gtk2
x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Platform.h
+25
View File
@@ -0,0 +1,25 @@
$NetBSD: patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Platform.h,v 1.1 2016/08/30 07:58:27 richard Exp $
deal with aarch64
--- src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h.orig 2015-05-07 14:14:45.000000000 +0000
+++ src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h
@@ -373,6 +373,10 @@
#define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
#endif
+/* CPU(AARCH64) */
+#if defined(__aarch64__)
+#define WTF_CPU_AARCH64 1
+#endif
/* ==== OS() - underlying operating system; only to be used for mandated low-level services like
virtual memory, not to choose a GUI toolkit ==== */
@@ -1003,7 +1007,8 @@
|| CPU(SPARC64) \
|| CPU(S390X) \
|| CPU(PPC64) \
- || CPU(MIPS64)
+ || CPU(MIPS64) \
+ || CPU(AARCH64)
#define WTF_USE_JSVALUE64 1
#else
#define WTF_USE_JSVALUE32_64 1
x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_WebKit2_DerivedSources.pro
+23
View File
@@ -0,0 +1,23 @@
$NetBSD: patch-src_3rdparty_webkit_Source_WebKit2_DerivedSources.pro,v 1.2 2016/05/25 07:46:47 nros Exp $
* Don't create prl and put /include/WebCore inside the src directory
to not pullute /, it is empty and unused in qt4.
--- src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro.orig 2016-04-29 10:42:47.000000000 +0000
+++ src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro
@@ -1,7 +1,7 @@
TEMPLATE = lib
TARGET = dummy
-CONFIG -= debug_and_release
+CONFIG -= debug_and_release create_prl
CONFIG(standalone_package) {
isEmpty(WEBKIT2_GENERATED_SOURCES_DIR):WEBKIT2_GENERATED_SOURCES_DIR = $$PWD/generated
@@ -158,7 +158,7 @@
HEADER_PATH = $$HEADER
HEADER_TARGET = $$replace(HEADER_PATH, [^a-zA-Z0-9_], -)
HEADER_TARGET = "qtheader-$${HEADER_TARGET}"
- DESTDIR = $$OUTPUT_DIR/include/"WebCore"
+ DESTDIR = $$PWD/../include/"WebCore"
eval($${HEADER_TARGET}.target = $$DESTDIR/$$HEADER_NAME)
eval($${HEADER_TARGET}.depends = $$HEADER_PATH)
x11/qt4-libs/patches/patch-src_corelib_thread_qthread__unix.cpp
+24 -3
View File
@@ -1,6 +1,6 @@
$NetBSD: patch-src_corelib_thread_qthread__unix.cpp,v 1.1 2015/06/25 08:02:25 joerg Exp $
$NetBSD: patch-src_corelib_thread_qthread__unix.cpp,v 1.3 2016/05/31 21:35:11 joerg Exp $
--- src/corelib/thread/qthread_unix.cpp.orig 2015-06-23 15:32:25.000000000 +0000
--- src/corelib/thread/qthread_unix.cpp.orig 2015-05-07 14:14:48.000000000 +0000
+++ src/corelib/thread/qthread_unix.cpp
@@ -120,6 +120,12 @@ enum { ThreadPriorityResetFlag = 0x80000
#if defined(Q_CC_XLC) || defined (Q_CC_SUN)
@@ -8,10 +8,31 @@ $NetBSD: patch-src_corelib_thread_qthread__unix.cpp,v 1.1 2015/06/25 08:02:25 jo
#endif
+#if defined(Q_OS_NETBSD)
+#include <machine/types.h>
+#if defined(__HAVE_TLS)
+#if defined(__HAVE_TLS_VARIANT_I) || defined(__HAVE_TLS_VARIANT_II)
+#define HAVE_TLS
+#endif
+#endif
#ifdef HAVE_TLS
static __thread QThreadData *currentThreadData = 0;
@@ -167,20 +173,6 @@ static void create_current_thread_data_k
pthread_key_create(&current_thread_data_key, destroy_current_thread_data);
}
-static void destroy_current_thread_data_key()
-{
- pthread_once(&current_thread_data_once, create_current_thread_data_key);
- pthread_key_delete(current_thread_data_key);
-
- // Reset current_thread_data_once in case we end up recreating
- // the thread-data in the rare case of QObject construction
- // after destroying the QThreadData.
- pthread_once_t pthread_once_init = PTHREAD_ONCE_INIT;
- current_thread_data_once = pthread_once_init;
-}
-Q_DESTRUCTOR_FUNCTION(destroy_current_thread_data_key)
-
-
// Utility functions for getting, setting and clearing thread specific data.
static QThreadData *get_thread_data()
{
x11/qt4-libs/patches/patch-src_gui_painting_qpaintengine__mac.cpp
+27
View File
@@ -0,0 +1,27 @@
$NetBSD: patch-src_gui_painting_qpaintengine__mac.cpp,v 1.1 2015/11/19 00:06:15 wiedi Exp $
CMGetProfileByAVID and CMCloseProfile have been deprecated.
Fixes errors like:
error: use of undeclared identifier 'CMGetProfileByAVID'
error: use of undeclared identifier 'CMCloseProfile'
Taken from homebrew https://raw.githubusercontent.com/Homebrew/patches/480b7142c4e2ae07de6028f672695eb927a34875/qt/el-capitan.patch
which is based on upstream issue http://code.qt.io/cgit/qt/qtbase.git/commit/?id=b06304e164ba47351fa292662c1e6383c081b5ca
--- src/gui/painting/qpaintengine_mac.cpp.orig 2015-05-07 14:14:43.000000000 +0000
+++ src/gui/painting/qpaintengine_mac.cpp
@@ -340,13 +340,7 @@ CGColorSpaceRef QCoreGraphicsPaintEngine
}
// Get the color space from the display profile.
- CGColorSpaceRef colorSpace = 0;
- CMProfileRef displayProfile = 0;
- CMError err = CMGetProfileByAVID((CMDisplayIDType)displayID, &displayProfile);
- if (err == noErr) {
- colorSpace = CGColorSpaceCreateWithPlatformColorSpace(displayProfile);
- CMCloseProfile(displayProfile);
- }
+ CGColorSpaceRef colorSpace = CGDisplayCopyColorSpace(displayID);
// Fallback: use generic DeviceRGB
if (colorSpace == 0)