* [PR PATCH] qt-webkit: remove
@ 2019-09-17 12:40 voidlinux-github
2019-09-17 12:41 ` [PR PATCH] [Updated] " voidlinux-github
` (10 more replies)
0 siblings, 11 replies; 12+ messages in thread
From: voidlinux-github @ 2019-09-17 12:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 400 bytes --]
There is a new pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages qt-webkit
https://github.com/void-linux/void-packages/pull/14520
qt-webkit: remove
there are also a few python-PyQt4-* packages in the binary repos that have to be removed
A patch file from https://github.com/void-linux/void-packages/pull/14520.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt-webkit-14520.patch --]
[-- Type: text/x-diff, Size: 11501 bytes --]
From 898c1094872029b69d109edb08ddf247c6d5c184 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Tue, 17 Sep 2019 14:33:08 +0200
Subject: [PATCH] qt-webkit: remove
---
srcpkgs/qt-webkit-devel | 1 -
srcpkgs/qt-webkit/INSTALL.msg | 1 +
srcpkgs/qt-webkit/files/fix-execinfo.patch | 20 ----
srcpkgs/qt-webkit/files/fix-gcc6.patch | 14 ---
srcpkgs/qt-webkit/files/fix-mallinfo.patch | 11 --
.../files/fix-saturated_arithmetic.patch | 20 ----
srcpkgs/qt-webkit/files/qwebview.patch | 21 ----
srcpkgs/qt-webkit/template | 111 +-----------------
8 files changed, 5 insertions(+), 194 deletions(-)
delete mode 120000 srcpkgs/qt-webkit-devel
create mode 100644 srcpkgs/qt-webkit/INSTALL.msg
delete mode 100644 srcpkgs/qt-webkit/files/fix-execinfo.patch
delete mode 100644 srcpkgs/qt-webkit/files/fix-gcc6.patch
delete mode 100644 srcpkgs/qt-webkit/files/fix-mallinfo.patch
delete mode 100644 srcpkgs/qt-webkit/files/fix-saturated_arithmetic.patch
delete mode 100644 srcpkgs/qt-webkit/files/qwebview.patch
diff --git a/srcpkgs/qt-webkit-devel b/srcpkgs/qt-webkit-devel
deleted file mode 120000
index f3c82c42591..00000000000
--- a/srcpkgs/qt-webkit-devel
+++ /dev/null
@@ -1 +0,0 @@
-qt-webkit
\ No newline at end of file
diff --git a/srcpkgs/qt-webkit/INSTALL.msg b/srcpkgs/qt-webkit/INSTALL.msg
new file mode 100644
index 00000000000..07765985647
--- /dev/null
+++ b/srcpkgs/qt-webkit/INSTALL.msg
@@ -0,0 +1 @@
+qt-webkit is no longer provided by Void Linux, and will be fully removed from the repos on 2019-12-17
diff --git a/srcpkgs/qt-webkit/files/fix-execinfo.patch b/srcpkgs/qt-webkit/files/fix-execinfo.patch
deleted file mode 100644
index 93a4dec73fa..00000000000
--- a/srcpkgs/qt-webkit/files/fix-execinfo.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- qtwebkit-2.3.4/Source/WTF/wtf/Assertions.cpp 2014-09-24 13:42:05.000000000 +0200
-+++ qtwebkit-2.3.4/Source/WTF/wtf/Assertions.cpp 2016-09-17 23:37:12.846758706 +0200
-@@ -58,7 +58,7 @@
- #include <windows.h>
- #endif
-
--#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
-+#if (OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__))) && !OS(ANDROID)
- #include <cxxabi.h>
- #include <dlfcn.h>
- #include <execinfo.h>
-@@ -242,7 +242,7 @@
-
- void WTFGetBacktrace(void** stack, int* size)
- {
--#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
-+#if (OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__))) && !OS(ANDROID)
- *size = backtrace(stack, *size);
- #elif OS(WINDOWS) && !OS(WINCE)
- // The CaptureStackBackTrace function is available in XP, but it is not defined
diff --git a/srcpkgs/qt-webkit/files/fix-gcc6.patch b/srcpkgs/qt-webkit/files/fix-gcc6.patch
deleted file mode 100644
index 6e6215c7e25..00000000000
--- a/srcpkgs/qt-webkit/files/fix-gcc6.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- webkit-qtwebkit-23/Source/JavaScriptCore/runtime/JSObject.cpp.gcc5 2014-09-24 06:42:05.000000000 -0500
-+++ webkit-qtwebkit-23/Source/JavaScriptCore/runtime/JSObject.cpp 2015-03-20 08:15:53.192778375 -0500
-@@ -1922,6 +1922,10 @@ void JSObject::putByIndexBeyondVectorLen
- }
- }
-
-+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<ContiguousShape>(ExecState* exec, unsigned i, JSValue value);
-+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<DoubleShape>(ExecState* exec, unsigned i, JSValue value);
-+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<Int32Shape>(ExecState* exec, unsigned i, JSValue value);
-+
- void JSObject::putByIndexBeyondVectorLengthWithArrayStorage(ExecState* exec, unsigned i, JSValue value, bool shouldThrow, ArrayStorage* storage)
- {
- JSGlobalData& globalData = exec->globalData();
-
diff --git a/srcpkgs/qt-webkit/files/fix-mallinfo.patch b/srcpkgs/qt-webkit/files/fix-mallinfo.patch
deleted file mode 100644
index 60c5d085fe0..00000000000
--- a/srcpkgs/qt-webkit/files/fix-mallinfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qtwebkit-2.3.4/Source/WebCore/platform/qt/MemoryUsageSupportQt.cpp 2014-09-24 13:42:05.000000000 +0200
-+++ qtwebkit-2.3.4/Source/WebCore/platform/qt/MemoryUsageSupportQt.cpp 2016-09-17 23:48:23.558775636 +0200
-@@ -31,7 +31,7 @@
-
- namespace WebCore {
-
--#if OS(LINUX)
-+#if OS(LINUX) && defined(__GLIBC__)
- static size_t mallocMemoryUsage(bool inuse)
- {
- // Return how much memory (in bytes) has been allocated on the system heap.
diff --git a/srcpkgs/qt-webkit/files/fix-saturated_arithmetic.patch b/srcpkgs/qt-webkit/files/fix-saturated_arithmetic.patch
deleted file mode 100644
index f9a18220a99..00000000000
--- a/srcpkgs/qt-webkit/files/fix-saturated_arithmetic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- qtwebkit-2.3.4/Source/WTF/wtf/SaturatedArithmetic.h 2014-09-24 13:42:05.000000000 +0200
-+++ qtwebkit-2.3.4/Source/WTF/wtf/SaturatedArithmetic.h 2017-02-19 16:27:58.343676787 +0100
-@@ -43,7 +43,7 @@
-
- // Can only overflow if the signed bit of the two values match. If the signed
- // bit of the result and one of the values differ it did overflow.
-- if (!((ua ^ ub) >> 31) & (result ^ ua) >> 31)
-+ if (~((ua ^ ub) >> 31) & ((result ^ ua) >> 31))
- result = std::numeric_limits<int>::max() + (ua >> 31);
-
- return result;
-@@ -57,7 +57,7 @@
-
- // Can only overflow if the signed bit of the two values do not match. If the
- // signed bit of the result and the first value differ it did overflow.
-- if ((ua ^ ub) >> 31 & (result ^ ua) >> 31)
-+ if (((ua ^ ub) >> 31) & ((result ^ ua) >> 31))
- result = std::numeric_limits<int>::max() + (ua >> 31);
-
- return result;
diff --git a/srcpkgs/qt-webkit/files/qwebview.patch b/srcpkgs/qt-webkit/files/qwebview.patch
deleted file mode 100644
index f8aa8c3101b..00000000000
--- a/srcpkgs/qt-webkit/files/qwebview.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- qt-everywhere-opensource-src-4.8.7/tools/designer/src/plugins/plugins.pri~ 2013-01-09 12:56:08.915412090 +0000
-+++ qt-everywhere-opensource-src-4.8.7/tools/designer/src/plugins/plugins.pri 2013-01-09 12:58:06.911391299 +0000
-@@ -1,3 +1,6 @@
-+INCLUDEPATH += ../../../../../../qtwebkit-2.3.4/WebKitBuild/Release/include
-+LIBS += -L../../../../../../qtwebkit-2.3.4/WebKitBuild/Release/lib
-+
- CONFIG += designer
- win32|mac: CONFIG+= debug_and_release
- QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/designer
---- qt-everywhere-opensource-src-4.8.7/tools/designer/src/plugins/plugins.pro~ 2013-01-09 12:55:43.598892405 +0000
-+++ qt-everywhere-opensource-src-4.8.7/tools/designer/src/plugins/plugins.pro 2013-01-09 12:55:53.352169136 +0000
-@@ -2,9 +2,4 @@
- CONFIG += ordered
-
- REQUIRES = !CONFIG(static,shared|static)
--contains(QT_CONFIG, qt3support): SUBDIRS += widgets
--win32: SUBDIRS += activeqt
--# contains(QT_CONFIG, opengl): SUBDIRS += tools/view3d
- contains(QT_CONFIG, webkit): SUBDIRS += qwebview
--contains(QT_CONFIG, phonon): SUBDIRS += phononwidgets
--contains(QT_CONFIG, declarative): SUBDIRS += qdeclarativeview
diff --git a/srcpkgs/qt-webkit/template b/srcpkgs/qt-webkit/template
index 1c3ff6c0ee2..a4455596bd5 100644
--- a/srcpkgs/qt-webkit/template
+++ b/srcpkgs/qt-webkit/template
@@ -1,113 +1,10 @@
# Template file for 'qt-webkit'
pkgname=qt-webkit
version=2.3.4
-revision=7
-_qtver=4.8.7
-wrksrc="qtwebkit-${version}"
-create_wrksrc=yes
-hostmakedepends="automake libtool bison flex gperf python ruby pkg-config qt-qmake"
-makedepends="MesaLib-devel libjpeg-turbo-devel qt-devel qt-designer-devel
- glib-devel fontconfig-devel gst-plugins-base1-devel sqlite-devel libXrender-devel"
-short_desc="Open source web browser engine (Qt4 port)"
+revision=8
+short_desc="Open source web browser engine (Qt4 port) (removed package)"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="LGPL-2.1, GPL-3"
+license="BSD-2-Clause"
homepage="http://trac.webkit.org/wiki/QtWebKit"
-distfiles="
- http://download.kde.org/stable/qtwebkit-${version%.*}/${version}/src/qtwebkit-${version}.tar.gz
- http://download.qt.io/official_releases/qt/${_qtver%.*}/${_qtver}/qt-everywhere-opensource-src-${_qtver}.tar.gz"
-checksum="
- c6cfa9d068f7eb024fee3f6c24f5b8b726997f669007587f35ed4a97d40097ca
- e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0"
conflicts="qt<4.8.7_12"
-
-if [ -n "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt-devel qt-designer-devel"
-fi
-
-# Use the same value for -std= as in qt
-CXXFLAGS="-std=gnu++98 -Wno-deprecated -fno-delete-null-pointer-checks -fno-lifetime-dse"
-
-post_extract() {
- patch -p1 < ${FILESDIR}/fix-gcc6.patch
- patch -p1 < ${FILESDIR}/fix-execinfo.patch
- patch -p1 < ${FILESDIR}/fix-mallinfo.patch
- patch -p0 < ${FILESDIR}/qwebview.patch
- mv qt-everywhere-opensource-src-${_qtver} ..
-}
-
-do_configure() {
- :
-}
-
-do_build() {
- local opts="--qt --prefix=/usr --no-webkit2 --release"
- case "$XBPS_TARGET_MACHINE" in
- i686*) # Do not force SSE2 for i686
- opts+=" --no-force-sse2"
- ;;
- aarch64*)
- # Disable JIT
- opts+=" DEFINES+=ENABLE_JIT=0"
- opts+=" DEFINES+=ENABLE_YARR_JIT=0"
- ;;
- arm*|mips*|ppc*)
- # Disable JIT and assembler
- opts+=" DEFINES+=ENABLE_JIT=0"
- opts+=" DEFINES+=ENABLE_YARR_JIT=0"
- opts+=" DEFINES+=ENABLE_ASSEMBLER=0"
- ;;
- esac
- if [ -n "$CROSS_BUILD" ]; then
- opts+=" --qmakearg=\"CONFIG+=production_build\""
- opts+=" --qmakearg=\"QMAKE_CC=$CC\""
- opts+=" --qmakearg=\"QMAKE_CXX=$CXX\""
- opts+=" --qmakearg=\"QMAKE_LINK=$CXX\""
- opts+=" --qmakearg=\"QMAKE_LINK_SHARED=$CXX\""
- opts+=" --qmakearg=\"QMAKE_AR=$AR cru\""
- opts+=" --qmakearg=\"QMAKE_OBJDUMP=$OBJDUMP\""
- opts+=" --qmakearg=\"QMAKE_CFLAGS='$CFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_CFLAGS_RELEASE='$CFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_CXXFLAGS='$CXXFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_CXXFLAGS_RELEASE='$CXXFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_LFLAGS='$LDFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_LFLAGS_RELEASE='$LDFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_INCDIR=${XBPS_CROSS_BASE}/usr/include\""
- opts+=" --qmakearg=\"QMAKE_INCDIR_QT=${XBPS_CROSS_BASE}/usr/include\""
- fi
- export QTDIR=/usr
- export PATH="/usr/lib/qt/bin:$PATH"
- find -name "Makefile*" -exec sed -i "{}" \
- -e"s;^\(CC[ ]*=\).*;\1 $CC;" \
- -e"s;^\(CXX[ ]*=\).*;\1 $CXX;" \
- -e"s;^\(LINK[ ]*=\).*;\1 $CXX;" \
- -e"s;^\(CFLAGS[ ]*=\)\(.*\);\1 \2 $CFLAGS;" \
- -e"s;^\(CXXFLAGS[ ]*=\)\(.*\);\1 \2 $CXXFLAGS;" \
- -e"s;^\(LFLAGS[ ]*=\)\(.*\);\1 \2 $LDFLAGS;" \
- \;
- Tools/Scripts/build-webkit --makeargs="${makejobs}" ${opts}
- cd ../qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview
- qmake QMAKE_CFLAGS="$CFLAGS" QMAKE_CXXFLAGS="$CXXFLAGS" QMAKE_LFLAGS="$LDFLAGS"
- make ${makejobs} CC="$CC" CXX="$CXX" LINK="$CXX"
-}
-
-do_install() {
- make INSTALL_ROOT="${DESTDIR}" -C WebKitBuild/Release install
- cd ../qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview
- make INSTALL_ROOT="${DESTDIR}" install
-
- # Remove references to the build directory from .prl and .pc files
- sed -i 's| -L.*/*/release||g' ${DESTDIR}/usr/lib/pkgconfig/QtWebKit.pc
- sed -i '/^QMAKE_PRL_BUILD_DIR/d' ${DESTDIR}/usr/lib/libQtWebKit.prl
-}
-
-qt-webkit-devel_package() {
- short_desc+=" - development files"
- depends="qt-devel ${sourcepkg}>=${version}_${revision}"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/*.so
- vmove usr/lib/*.prl
- vmove usr/lib/pkgconfig
- vmove usr/share/qt/mkspecs
- }
-}
+replaces="qt-webkit-devel>=0"
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Updated] qt-webkit: remove
2019-09-17 12:40 [PR PATCH] qt-webkit: remove voidlinux-github
2019-09-17 12:41 ` [PR PATCH] [Updated] " voidlinux-github
@ 2019-09-17 12:41 ` voidlinux-github
2019-09-17 12:44 ` [PR PATCH] [Updated] [WIP] " voidlinux-github
` (8 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: voidlinux-github @ 2019-09-17 12:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 405 bytes --]
There is an updated pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages qt-webkit
https://github.com/void-linux/void-packages/pull/14520
qt-webkit: remove
there are also a few python-PyQt4-* packages in the binary repos that have to be removed
A patch file from https://github.com/void-linux/void-packages/pull/14520.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt-webkit-14520.patch --]
[-- Type: text/x-diff, Size: 11519 bytes --]
From 5a65b01dd6f4f6c32b37a5c7071ba34ca97f1672 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Tue, 17 Sep 2019 14:33:08 +0200
Subject: [PATCH] qt-webkit: remove
---
srcpkgs/qt-webkit-devel | 1 -
srcpkgs/qt-webkit/INSTALL.msg | 1 +
srcpkgs/qt-webkit/files/fix-execinfo.patch | 20 ----
srcpkgs/qt-webkit/files/fix-gcc6.patch | 14 ---
srcpkgs/qt-webkit/files/fix-mallinfo.patch | 11 --
.../files/fix-saturated_arithmetic.patch | 20 ----
srcpkgs/qt-webkit/files/qwebview.patch | 21 ----
srcpkgs/qt-webkit/template | 112 +-----------------
8 files changed, 6 insertions(+), 194 deletions(-)
delete mode 120000 srcpkgs/qt-webkit-devel
create mode 100644 srcpkgs/qt-webkit/INSTALL.msg
delete mode 100644 srcpkgs/qt-webkit/files/fix-execinfo.patch
delete mode 100644 srcpkgs/qt-webkit/files/fix-gcc6.patch
delete mode 100644 srcpkgs/qt-webkit/files/fix-mallinfo.patch
delete mode 100644 srcpkgs/qt-webkit/files/fix-saturated_arithmetic.patch
delete mode 100644 srcpkgs/qt-webkit/files/qwebview.patch
diff --git a/srcpkgs/qt-webkit-devel b/srcpkgs/qt-webkit-devel
deleted file mode 120000
index f3c82c42591..00000000000
--- a/srcpkgs/qt-webkit-devel
+++ /dev/null
@@ -1 +0,0 @@
-qt-webkit
\ No newline at end of file
diff --git a/srcpkgs/qt-webkit/INSTALL.msg b/srcpkgs/qt-webkit/INSTALL.msg
new file mode 100644
index 00000000000..07765985647
--- /dev/null
+++ b/srcpkgs/qt-webkit/INSTALL.msg
@@ -0,0 +1 @@
+qt-webkit is no longer provided by Void Linux, and will be fully removed from the repos on 2019-12-17
diff --git a/srcpkgs/qt-webkit/files/fix-execinfo.patch b/srcpkgs/qt-webkit/files/fix-execinfo.patch
deleted file mode 100644
index 93a4dec73fa..00000000000
--- a/srcpkgs/qt-webkit/files/fix-execinfo.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- qtwebkit-2.3.4/Source/WTF/wtf/Assertions.cpp 2014-09-24 13:42:05.000000000 +0200
-+++ qtwebkit-2.3.4/Source/WTF/wtf/Assertions.cpp 2016-09-17 23:37:12.846758706 +0200
-@@ -58,7 +58,7 @@
- #include <windows.h>
- #endif
-
--#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
-+#if (OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__))) && !OS(ANDROID)
- #include <cxxabi.h>
- #include <dlfcn.h>
- #include <execinfo.h>
-@@ -242,7 +242,7 @@
-
- void WTFGetBacktrace(void** stack, int* size)
- {
--#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
-+#if (OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__))) && !OS(ANDROID)
- *size = backtrace(stack, *size);
- #elif OS(WINDOWS) && !OS(WINCE)
- // The CaptureStackBackTrace function is available in XP, but it is not defined
diff --git a/srcpkgs/qt-webkit/files/fix-gcc6.patch b/srcpkgs/qt-webkit/files/fix-gcc6.patch
deleted file mode 100644
index 6e6215c7e25..00000000000
--- a/srcpkgs/qt-webkit/files/fix-gcc6.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- webkit-qtwebkit-23/Source/JavaScriptCore/runtime/JSObject.cpp.gcc5 2014-09-24 06:42:05.000000000 -0500
-+++ webkit-qtwebkit-23/Source/JavaScriptCore/runtime/JSObject.cpp 2015-03-20 08:15:53.192778375 -0500
-@@ -1922,6 +1922,10 @@ void JSObject::putByIndexBeyondVectorLen
- }
- }
-
-+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<ContiguousShape>(ExecState* exec, unsigned i, JSValue value);
-+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<DoubleShape>(ExecState* exec, unsigned i, JSValue value);
-+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<Int32Shape>(ExecState* exec, unsigned i, JSValue value);
-+
- void JSObject::putByIndexBeyondVectorLengthWithArrayStorage(ExecState* exec, unsigned i, JSValue value, bool shouldThrow, ArrayStorage* storage)
- {
- JSGlobalData& globalData = exec->globalData();
-
diff --git a/srcpkgs/qt-webkit/files/fix-mallinfo.patch b/srcpkgs/qt-webkit/files/fix-mallinfo.patch
deleted file mode 100644
index 60c5d085fe0..00000000000
--- a/srcpkgs/qt-webkit/files/fix-mallinfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qtwebkit-2.3.4/Source/WebCore/platform/qt/MemoryUsageSupportQt.cpp 2014-09-24 13:42:05.000000000 +0200
-+++ qtwebkit-2.3.4/Source/WebCore/platform/qt/MemoryUsageSupportQt.cpp 2016-09-17 23:48:23.558775636 +0200
-@@ -31,7 +31,7 @@
-
- namespace WebCore {
-
--#if OS(LINUX)
-+#if OS(LINUX) && defined(__GLIBC__)
- static size_t mallocMemoryUsage(bool inuse)
- {
- // Return how much memory (in bytes) has been allocated on the system heap.
diff --git a/srcpkgs/qt-webkit/files/fix-saturated_arithmetic.patch b/srcpkgs/qt-webkit/files/fix-saturated_arithmetic.patch
deleted file mode 100644
index f9a18220a99..00000000000
--- a/srcpkgs/qt-webkit/files/fix-saturated_arithmetic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- qtwebkit-2.3.4/Source/WTF/wtf/SaturatedArithmetic.h 2014-09-24 13:42:05.000000000 +0200
-+++ qtwebkit-2.3.4/Source/WTF/wtf/SaturatedArithmetic.h 2017-02-19 16:27:58.343676787 +0100
-@@ -43,7 +43,7 @@
-
- // Can only overflow if the signed bit of the two values match. If the signed
- // bit of the result and one of the values differ it did overflow.
-- if (!((ua ^ ub) >> 31) & (result ^ ua) >> 31)
-+ if (~((ua ^ ub) >> 31) & ((result ^ ua) >> 31))
- result = std::numeric_limits<int>::max() + (ua >> 31);
-
- return result;
-@@ -57,7 +57,7 @@
-
- // Can only overflow if the signed bit of the two values do not match. If the
- // signed bit of the result and the first value differ it did overflow.
-- if ((ua ^ ub) >> 31 & (result ^ ua) >> 31)
-+ if (((ua ^ ub) >> 31) & ((result ^ ua) >> 31))
- result = std::numeric_limits<int>::max() + (ua >> 31);
-
- return result;
diff --git a/srcpkgs/qt-webkit/files/qwebview.patch b/srcpkgs/qt-webkit/files/qwebview.patch
deleted file mode 100644
index f8aa8c3101b..00000000000
--- a/srcpkgs/qt-webkit/files/qwebview.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- qt-everywhere-opensource-src-4.8.7/tools/designer/src/plugins/plugins.pri~ 2013-01-09 12:56:08.915412090 +0000
-+++ qt-everywhere-opensource-src-4.8.7/tools/designer/src/plugins/plugins.pri 2013-01-09 12:58:06.911391299 +0000
-@@ -1,3 +1,6 @@
-+INCLUDEPATH += ../../../../../../qtwebkit-2.3.4/WebKitBuild/Release/include
-+LIBS += -L../../../../../../qtwebkit-2.3.4/WebKitBuild/Release/lib
-+
- CONFIG += designer
- win32|mac: CONFIG+= debug_and_release
- QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/designer
---- qt-everywhere-opensource-src-4.8.7/tools/designer/src/plugins/plugins.pro~ 2013-01-09 12:55:43.598892405 +0000
-+++ qt-everywhere-opensource-src-4.8.7/tools/designer/src/plugins/plugins.pro 2013-01-09 12:55:53.352169136 +0000
-@@ -2,9 +2,4 @@
- CONFIG += ordered
-
- REQUIRES = !CONFIG(static,shared|static)
--contains(QT_CONFIG, qt3support): SUBDIRS += widgets
--win32: SUBDIRS += activeqt
--# contains(QT_CONFIG, opengl): SUBDIRS += tools/view3d
- contains(QT_CONFIG, webkit): SUBDIRS += qwebview
--contains(QT_CONFIG, phonon): SUBDIRS += phononwidgets
--contains(QT_CONFIG, declarative): SUBDIRS += qdeclarativeview
diff --git a/srcpkgs/qt-webkit/template b/srcpkgs/qt-webkit/template
index 1c3ff6c0ee2..ecaa15fcd16 100644
--- a/srcpkgs/qt-webkit/template
+++ b/srcpkgs/qt-webkit/template
@@ -1,113 +1,11 @@
# Template file for 'qt-webkit'
pkgname=qt-webkit
version=2.3.4
-revision=7
-_qtver=4.8.7
-wrksrc="qtwebkit-${version}"
-create_wrksrc=yes
-hostmakedepends="automake libtool bison flex gperf python ruby pkg-config qt-qmake"
-makedepends="MesaLib-devel libjpeg-turbo-devel qt-devel qt-designer-devel
- glib-devel fontconfig-devel gst-plugins-base1-devel sqlite-devel libXrender-devel"
-short_desc="Open source web browser engine (Qt4 port)"
+revision=8
+build_style=meta
+short_desc="Open source web browser engine (Qt4 port) (removed package)"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="LGPL-2.1, GPL-3"
+license="BSD-2-Clause"
homepage="http://trac.webkit.org/wiki/QtWebKit"
-distfiles="
- http://download.kde.org/stable/qtwebkit-${version%.*}/${version}/src/qtwebkit-${version}.tar.gz
- http://download.qt.io/official_releases/qt/${_qtver%.*}/${_qtver}/qt-everywhere-opensource-src-${_qtver}.tar.gz"
-checksum="
- c6cfa9d068f7eb024fee3f6c24f5b8b726997f669007587f35ed4a97d40097ca
- e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0"
conflicts="qt<4.8.7_12"
-
-if [ -n "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt-devel qt-designer-devel"
-fi
-
-# Use the same value for -std= as in qt
-CXXFLAGS="-std=gnu++98 -Wno-deprecated -fno-delete-null-pointer-checks -fno-lifetime-dse"
-
-post_extract() {
- patch -p1 < ${FILESDIR}/fix-gcc6.patch
- patch -p1 < ${FILESDIR}/fix-execinfo.patch
- patch -p1 < ${FILESDIR}/fix-mallinfo.patch
- patch -p0 < ${FILESDIR}/qwebview.patch
- mv qt-everywhere-opensource-src-${_qtver} ..
-}
-
-do_configure() {
- :
-}
-
-do_build() {
- local opts="--qt --prefix=/usr --no-webkit2 --release"
- case "$XBPS_TARGET_MACHINE" in
- i686*) # Do not force SSE2 for i686
- opts+=" --no-force-sse2"
- ;;
- aarch64*)
- # Disable JIT
- opts+=" DEFINES+=ENABLE_JIT=0"
- opts+=" DEFINES+=ENABLE_YARR_JIT=0"
- ;;
- arm*|mips*|ppc*)
- # Disable JIT and assembler
- opts+=" DEFINES+=ENABLE_JIT=0"
- opts+=" DEFINES+=ENABLE_YARR_JIT=0"
- opts+=" DEFINES+=ENABLE_ASSEMBLER=0"
- ;;
- esac
- if [ -n "$CROSS_BUILD" ]; then
- opts+=" --qmakearg=\"CONFIG+=production_build\""
- opts+=" --qmakearg=\"QMAKE_CC=$CC\""
- opts+=" --qmakearg=\"QMAKE_CXX=$CXX\""
- opts+=" --qmakearg=\"QMAKE_LINK=$CXX\""
- opts+=" --qmakearg=\"QMAKE_LINK_SHARED=$CXX\""
- opts+=" --qmakearg=\"QMAKE_AR=$AR cru\""
- opts+=" --qmakearg=\"QMAKE_OBJDUMP=$OBJDUMP\""
- opts+=" --qmakearg=\"QMAKE_CFLAGS='$CFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_CFLAGS_RELEASE='$CFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_CXXFLAGS='$CXXFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_CXXFLAGS_RELEASE='$CXXFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_LFLAGS='$LDFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_LFLAGS_RELEASE='$LDFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_INCDIR=${XBPS_CROSS_BASE}/usr/include\""
- opts+=" --qmakearg=\"QMAKE_INCDIR_QT=${XBPS_CROSS_BASE}/usr/include\""
- fi
- export QTDIR=/usr
- export PATH="/usr/lib/qt/bin:$PATH"
- find -name "Makefile*" -exec sed -i "{}" \
- -e"s;^\(CC[ ]*=\).*;\1 $CC;" \
- -e"s;^\(CXX[ ]*=\).*;\1 $CXX;" \
- -e"s;^\(LINK[ ]*=\).*;\1 $CXX;" \
- -e"s;^\(CFLAGS[ ]*=\)\(.*\);\1 \2 $CFLAGS;" \
- -e"s;^\(CXXFLAGS[ ]*=\)\(.*\);\1 \2 $CXXFLAGS;" \
- -e"s;^\(LFLAGS[ ]*=\)\(.*\);\1 \2 $LDFLAGS;" \
- \;
- Tools/Scripts/build-webkit --makeargs="${makejobs}" ${opts}
- cd ../qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview
- qmake QMAKE_CFLAGS="$CFLAGS" QMAKE_CXXFLAGS="$CXXFLAGS" QMAKE_LFLAGS="$LDFLAGS"
- make ${makejobs} CC="$CC" CXX="$CXX" LINK="$CXX"
-}
-
-do_install() {
- make INSTALL_ROOT="${DESTDIR}" -C WebKitBuild/Release install
- cd ../qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview
- make INSTALL_ROOT="${DESTDIR}" install
-
- # Remove references to the build directory from .prl and .pc files
- sed -i 's| -L.*/*/release||g' ${DESTDIR}/usr/lib/pkgconfig/QtWebKit.pc
- sed -i '/^QMAKE_PRL_BUILD_DIR/d' ${DESTDIR}/usr/lib/libQtWebKit.prl
-}
-
-qt-webkit-devel_package() {
- short_desc+=" - development files"
- depends="qt-devel ${sourcepkg}>=${version}_${revision}"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/*.so
- vmove usr/lib/*.prl
- vmove usr/lib/pkgconfig
- vmove usr/share/qt/mkspecs
- }
-}
+replaces="qt-webkit-devel>=0"
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Updated] qt-webkit: remove
2019-09-17 12:40 [PR PATCH] qt-webkit: remove voidlinux-github
@ 2019-09-17 12:41 ` voidlinux-github
2019-09-17 12:41 ` voidlinux-github
` (9 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: voidlinux-github @ 2019-09-17 12:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 405 bytes --]
There is an updated pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages qt-webkit
https://github.com/void-linux/void-packages/pull/14520
qt-webkit: remove
there are also a few python-PyQt4-* packages in the binary repos that have to be removed
A patch file from https://github.com/void-linux/void-packages/pull/14520.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt-webkit-14520.patch --]
[-- Type: text/x-diff, Size: 11519 bytes --]
From 5a65b01dd6f4f6c32b37a5c7071ba34ca97f1672 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Tue, 17 Sep 2019 14:33:08 +0200
Subject: [PATCH] qt-webkit: remove
---
srcpkgs/qt-webkit-devel | 1 -
srcpkgs/qt-webkit/INSTALL.msg | 1 +
srcpkgs/qt-webkit/files/fix-execinfo.patch | 20 ----
srcpkgs/qt-webkit/files/fix-gcc6.patch | 14 ---
srcpkgs/qt-webkit/files/fix-mallinfo.patch | 11 --
.../files/fix-saturated_arithmetic.patch | 20 ----
srcpkgs/qt-webkit/files/qwebview.patch | 21 ----
srcpkgs/qt-webkit/template | 112 +-----------------
8 files changed, 6 insertions(+), 194 deletions(-)
delete mode 120000 srcpkgs/qt-webkit-devel
create mode 100644 srcpkgs/qt-webkit/INSTALL.msg
delete mode 100644 srcpkgs/qt-webkit/files/fix-execinfo.patch
delete mode 100644 srcpkgs/qt-webkit/files/fix-gcc6.patch
delete mode 100644 srcpkgs/qt-webkit/files/fix-mallinfo.patch
delete mode 100644 srcpkgs/qt-webkit/files/fix-saturated_arithmetic.patch
delete mode 100644 srcpkgs/qt-webkit/files/qwebview.patch
diff --git a/srcpkgs/qt-webkit-devel b/srcpkgs/qt-webkit-devel
deleted file mode 120000
index f3c82c42591..00000000000
--- a/srcpkgs/qt-webkit-devel
+++ /dev/null
@@ -1 +0,0 @@
-qt-webkit
\ No newline at end of file
diff --git a/srcpkgs/qt-webkit/INSTALL.msg b/srcpkgs/qt-webkit/INSTALL.msg
new file mode 100644
index 00000000000..07765985647
--- /dev/null
+++ b/srcpkgs/qt-webkit/INSTALL.msg
@@ -0,0 +1 @@
+qt-webkit is no longer provided by Void Linux, and will be fully removed from the repos on 2019-12-17
diff --git a/srcpkgs/qt-webkit/files/fix-execinfo.patch b/srcpkgs/qt-webkit/files/fix-execinfo.patch
deleted file mode 100644
index 93a4dec73fa..00000000000
--- a/srcpkgs/qt-webkit/files/fix-execinfo.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- qtwebkit-2.3.4/Source/WTF/wtf/Assertions.cpp 2014-09-24 13:42:05.000000000 +0200
-+++ qtwebkit-2.3.4/Source/WTF/wtf/Assertions.cpp 2016-09-17 23:37:12.846758706 +0200
-@@ -58,7 +58,7 @@
- #include <windows.h>
- #endif
-
--#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
-+#if (OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__))) && !OS(ANDROID)
- #include <cxxabi.h>
- #include <dlfcn.h>
- #include <execinfo.h>
-@@ -242,7 +242,7 @@
-
- void WTFGetBacktrace(void** stack, int* size)
- {
--#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
-+#if (OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__))) && !OS(ANDROID)
- *size = backtrace(stack, *size);
- #elif OS(WINDOWS) && !OS(WINCE)
- // The CaptureStackBackTrace function is available in XP, but it is not defined
diff --git a/srcpkgs/qt-webkit/files/fix-gcc6.patch b/srcpkgs/qt-webkit/files/fix-gcc6.patch
deleted file mode 100644
index 6e6215c7e25..00000000000
--- a/srcpkgs/qt-webkit/files/fix-gcc6.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- webkit-qtwebkit-23/Source/JavaScriptCore/runtime/JSObject.cpp.gcc5 2014-09-24 06:42:05.000000000 -0500
-+++ webkit-qtwebkit-23/Source/JavaScriptCore/runtime/JSObject.cpp 2015-03-20 08:15:53.192778375 -0500
-@@ -1922,6 +1922,10 @@ void JSObject::putByIndexBeyondVectorLen
- }
- }
-
-+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<ContiguousShape>(ExecState* exec, unsigned i, JSValue value);
-+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<DoubleShape>(ExecState* exec, unsigned i, JSValue value);
-+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<Int32Shape>(ExecState* exec, unsigned i, JSValue value);
-+
- void JSObject::putByIndexBeyondVectorLengthWithArrayStorage(ExecState* exec, unsigned i, JSValue value, bool shouldThrow, ArrayStorage* storage)
- {
- JSGlobalData& globalData = exec->globalData();
-
diff --git a/srcpkgs/qt-webkit/files/fix-mallinfo.patch b/srcpkgs/qt-webkit/files/fix-mallinfo.patch
deleted file mode 100644
index 60c5d085fe0..00000000000
--- a/srcpkgs/qt-webkit/files/fix-mallinfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qtwebkit-2.3.4/Source/WebCore/platform/qt/MemoryUsageSupportQt.cpp 2014-09-24 13:42:05.000000000 +0200
-+++ qtwebkit-2.3.4/Source/WebCore/platform/qt/MemoryUsageSupportQt.cpp 2016-09-17 23:48:23.558775636 +0200
-@@ -31,7 +31,7 @@
-
- namespace WebCore {
-
--#if OS(LINUX)
-+#if OS(LINUX) && defined(__GLIBC__)
- static size_t mallocMemoryUsage(bool inuse)
- {
- // Return how much memory (in bytes) has been allocated on the system heap.
diff --git a/srcpkgs/qt-webkit/files/fix-saturated_arithmetic.patch b/srcpkgs/qt-webkit/files/fix-saturated_arithmetic.patch
deleted file mode 100644
index f9a18220a99..00000000000
--- a/srcpkgs/qt-webkit/files/fix-saturated_arithmetic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- qtwebkit-2.3.4/Source/WTF/wtf/SaturatedArithmetic.h 2014-09-24 13:42:05.000000000 +0200
-+++ qtwebkit-2.3.4/Source/WTF/wtf/SaturatedArithmetic.h 2017-02-19 16:27:58.343676787 +0100
-@@ -43,7 +43,7 @@
-
- // Can only overflow if the signed bit of the two values match. If the signed
- // bit of the result and one of the values differ it did overflow.
-- if (!((ua ^ ub) >> 31) & (result ^ ua) >> 31)
-+ if (~((ua ^ ub) >> 31) & ((result ^ ua) >> 31))
- result = std::numeric_limits<int>::max() + (ua >> 31);
-
- return result;
-@@ -57,7 +57,7 @@
-
- // Can only overflow if the signed bit of the two values do not match. If the
- // signed bit of the result and the first value differ it did overflow.
-- if ((ua ^ ub) >> 31 & (result ^ ua) >> 31)
-+ if (((ua ^ ub) >> 31) & ((result ^ ua) >> 31))
- result = std::numeric_limits<int>::max() + (ua >> 31);
-
- return result;
diff --git a/srcpkgs/qt-webkit/files/qwebview.patch b/srcpkgs/qt-webkit/files/qwebview.patch
deleted file mode 100644
index f8aa8c3101b..00000000000
--- a/srcpkgs/qt-webkit/files/qwebview.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- qt-everywhere-opensource-src-4.8.7/tools/designer/src/plugins/plugins.pri~ 2013-01-09 12:56:08.915412090 +0000
-+++ qt-everywhere-opensource-src-4.8.7/tools/designer/src/plugins/plugins.pri 2013-01-09 12:58:06.911391299 +0000
-@@ -1,3 +1,6 @@
-+INCLUDEPATH += ../../../../../../qtwebkit-2.3.4/WebKitBuild/Release/include
-+LIBS += -L../../../../../../qtwebkit-2.3.4/WebKitBuild/Release/lib
-+
- CONFIG += designer
- win32|mac: CONFIG+= debug_and_release
- QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/designer
---- qt-everywhere-opensource-src-4.8.7/tools/designer/src/plugins/plugins.pro~ 2013-01-09 12:55:43.598892405 +0000
-+++ qt-everywhere-opensource-src-4.8.7/tools/designer/src/plugins/plugins.pro 2013-01-09 12:55:53.352169136 +0000
-@@ -2,9 +2,4 @@
- CONFIG += ordered
-
- REQUIRES = !CONFIG(static,shared|static)
--contains(QT_CONFIG, qt3support): SUBDIRS += widgets
--win32: SUBDIRS += activeqt
--# contains(QT_CONFIG, opengl): SUBDIRS += tools/view3d
- contains(QT_CONFIG, webkit): SUBDIRS += qwebview
--contains(QT_CONFIG, phonon): SUBDIRS += phononwidgets
--contains(QT_CONFIG, declarative): SUBDIRS += qdeclarativeview
diff --git a/srcpkgs/qt-webkit/template b/srcpkgs/qt-webkit/template
index 1c3ff6c0ee2..ecaa15fcd16 100644
--- a/srcpkgs/qt-webkit/template
+++ b/srcpkgs/qt-webkit/template
@@ -1,113 +1,11 @@
# Template file for 'qt-webkit'
pkgname=qt-webkit
version=2.3.4
-revision=7
-_qtver=4.8.7
-wrksrc="qtwebkit-${version}"
-create_wrksrc=yes
-hostmakedepends="automake libtool bison flex gperf python ruby pkg-config qt-qmake"
-makedepends="MesaLib-devel libjpeg-turbo-devel qt-devel qt-designer-devel
- glib-devel fontconfig-devel gst-plugins-base1-devel sqlite-devel libXrender-devel"
-short_desc="Open source web browser engine (Qt4 port)"
+revision=8
+build_style=meta
+short_desc="Open source web browser engine (Qt4 port) (removed package)"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="LGPL-2.1, GPL-3"
+license="BSD-2-Clause"
homepage="http://trac.webkit.org/wiki/QtWebKit"
-distfiles="
- http://download.kde.org/stable/qtwebkit-${version%.*}/${version}/src/qtwebkit-${version}.tar.gz
- http://download.qt.io/official_releases/qt/${_qtver%.*}/${_qtver}/qt-everywhere-opensource-src-${_qtver}.tar.gz"
-checksum="
- c6cfa9d068f7eb024fee3f6c24f5b8b726997f669007587f35ed4a97d40097ca
- e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0"
conflicts="qt<4.8.7_12"
-
-if [ -n "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt-devel qt-designer-devel"
-fi
-
-# Use the same value for -std= as in qt
-CXXFLAGS="-std=gnu++98 -Wno-deprecated -fno-delete-null-pointer-checks -fno-lifetime-dse"
-
-post_extract() {
- patch -p1 < ${FILESDIR}/fix-gcc6.patch
- patch -p1 < ${FILESDIR}/fix-execinfo.patch
- patch -p1 < ${FILESDIR}/fix-mallinfo.patch
- patch -p0 < ${FILESDIR}/qwebview.patch
- mv qt-everywhere-opensource-src-${_qtver} ..
-}
-
-do_configure() {
- :
-}
-
-do_build() {
- local opts="--qt --prefix=/usr --no-webkit2 --release"
- case "$XBPS_TARGET_MACHINE" in
- i686*) # Do not force SSE2 for i686
- opts+=" --no-force-sse2"
- ;;
- aarch64*)
- # Disable JIT
- opts+=" DEFINES+=ENABLE_JIT=0"
- opts+=" DEFINES+=ENABLE_YARR_JIT=0"
- ;;
- arm*|mips*|ppc*)
- # Disable JIT and assembler
- opts+=" DEFINES+=ENABLE_JIT=0"
- opts+=" DEFINES+=ENABLE_YARR_JIT=0"
- opts+=" DEFINES+=ENABLE_ASSEMBLER=0"
- ;;
- esac
- if [ -n "$CROSS_BUILD" ]; then
- opts+=" --qmakearg=\"CONFIG+=production_build\""
- opts+=" --qmakearg=\"QMAKE_CC=$CC\""
- opts+=" --qmakearg=\"QMAKE_CXX=$CXX\""
- opts+=" --qmakearg=\"QMAKE_LINK=$CXX\""
- opts+=" --qmakearg=\"QMAKE_LINK_SHARED=$CXX\""
- opts+=" --qmakearg=\"QMAKE_AR=$AR cru\""
- opts+=" --qmakearg=\"QMAKE_OBJDUMP=$OBJDUMP\""
- opts+=" --qmakearg=\"QMAKE_CFLAGS='$CFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_CFLAGS_RELEASE='$CFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_CXXFLAGS='$CXXFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_CXXFLAGS_RELEASE='$CXXFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_LFLAGS='$LDFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_LFLAGS_RELEASE='$LDFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_INCDIR=${XBPS_CROSS_BASE}/usr/include\""
- opts+=" --qmakearg=\"QMAKE_INCDIR_QT=${XBPS_CROSS_BASE}/usr/include\""
- fi
- export QTDIR=/usr
- export PATH="/usr/lib/qt/bin:$PATH"
- find -name "Makefile*" -exec sed -i "{}" \
- -e"s;^\(CC[ ]*=\).*;\1 $CC;" \
- -e"s;^\(CXX[ ]*=\).*;\1 $CXX;" \
- -e"s;^\(LINK[ ]*=\).*;\1 $CXX;" \
- -e"s;^\(CFLAGS[ ]*=\)\(.*\);\1 \2 $CFLAGS;" \
- -e"s;^\(CXXFLAGS[ ]*=\)\(.*\);\1 \2 $CXXFLAGS;" \
- -e"s;^\(LFLAGS[ ]*=\)\(.*\);\1 \2 $LDFLAGS;" \
- \;
- Tools/Scripts/build-webkit --makeargs="${makejobs}" ${opts}
- cd ../qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview
- qmake QMAKE_CFLAGS="$CFLAGS" QMAKE_CXXFLAGS="$CXXFLAGS" QMAKE_LFLAGS="$LDFLAGS"
- make ${makejobs} CC="$CC" CXX="$CXX" LINK="$CXX"
-}
-
-do_install() {
- make INSTALL_ROOT="${DESTDIR}" -C WebKitBuild/Release install
- cd ../qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview
- make INSTALL_ROOT="${DESTDIR}" install
-
- # Remove references to the build directory from .prl and .pc files
- sed -i 's| -L.*/*/release||g' ${DESTDIR}/usr/lib/pkgconfig/QtWebKit.pc
- sed -i '/^QMAKE_PRL_BUILD_DIR/d' ${DESTDIR}/usr/lib/libQtWebKit.prl
-}
-
-qt-webkit-devel_package() {
- short_desc+=" - development files"
- depends="qt-devel ${sourcepkg}>=${version}_${revision}"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/*.so
- vmove usr/lib/*.prl
- vmove usr/lib/pkgconfig
- vmove usr/share/qt/mkspecs
- }
-}
+replaces="qt-webkit-devel>=0"
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] qt-webkit: remove
2019-09-17 12:40 [PR PATCH] qt-webkit: remove voidlinux-github
2019-09-17 12:41 ` [PR PATCH] [Updated] " voidlinux-github
2019-09-17 12:41 ` voidlinux-github
@ 2019-09-17 12:44 ` voidlinux-github
2019-09-17 12:44 ` voidlinux-github
` (7 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: voidlinux-github @ 2019-09-17 12:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 411 bytes --]
There is an updated pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages qt-webkit
https://github.com/void-linux/void-packages/pull/14520
[WIP] qt-webkit: remove
there are also a few python-PyQt4-* packages in the binary repos that have to be removed
A patch file from https://github.com/void-linux/void-packages/pull/14520.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt-webkit-14520.patch --]
[-- Type: text/x-diff, Size: 12014 bytes --]
From 3ae3b4f5b6a5b4fbf7ade15c7176e02f110714c3 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Tue, 17 Sep 2019 14:33:08 +0200
Subject: [PATCH] qt-webkit: remove
---
common/shlibs | 1 -
srcpkgs/qt-webkit-devel | 1 -
srcpkgs/qt-webkit/INSTALL.msg | 1 +
srcpkgs/qt-webkit/files/fix-execinfo.patch | 20 ----
srcpkgs/qt-webkit/files/fix-gcc6.patch | 14 ---
srcpkgs/qt-webkit/files/fix-mallinfo.patch | 11 --
.../files/fix-saturated_arithmetic.patch | 20 ----
srcpkgs/qt-webkit/files/qwebview.patch | 21 ----
srcpkgs/qt-webkit/template | 112 +-----------------
9 files changed, 6 insertions(+), 195 deletions(-)
delete mode 120000 srcpkgs/qt-webkit-devel
create mode 100644 srcpkgs/qt-webkit/INSTALL.msg
delete mode 100644 srcpkgs/qt-webkit/files/fix-execinfo.patch
delete mode 100644 srcpkgs/qt-webkit/files/fix-gcc6.patch
delete mode 100644 srcpkgs/qt-webkit/files/fix-mallinfo.patch
delete mode 100644 srcpkgs/qt-webkit/files/fix-saturated_arithmetic.patch
delete mode 100644 srcpkgs/qt-webkit/files/qwebview.patch
diff --git a/common/shlibs b/common/shlibs
index d15941dce29..58260aabca0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -456,7 +456,6 @@ libQtSql.so.4 qt-4.5.3_1
libQtDeclarative.so.4 qt-4.5.3_1
libQtDesignerComponents.so.4 qt-designer-libs-4.7.8_13
libQtDesigner.so.4 qt-designer-libs-4.7.8_13
-libQtWebKit.so.4 qt-webkit-2.3.4_1
libsysfs.so.2 libsysfs-2.1.0_1
libsensors.so.5 libsensors-3.5.0_1
libcap-ng.so.0 libcap-ng-0.6.2_1
diff --git a/srcpkgs/qt-webkit-devel b/srcpkgs/qt-webkit-devel
deleted file mode 120000
index f3c82c42591..00000000000
--- a/srcpkgs/qt-webkit-devel
+++ /dev/null
@@ -1 +0,0 @@
-qt-webkit
\ No newline at end of file
diff --git a/srcpkgs/qt-webkit/INSTALL.msg b/srcpkgs/qt-webkit/INSTALL.msg
new file mode 100644
index 00000000000..07765985647
--- /dev/null
+++ b/srcpkgs/qt-webkit/INSTALL.msg
@@ -0,0 +1 @@
+qt-webkit is no longer provided by Void Linux, and will be fully removed from the repos on 2019-12-17
diff --git a/srcpkgs/qt-webkit/files/fix-execinfo.patch b/srcpkgs/qt-webkit/files/fix-execinfo.patch
deleted file mode 100644
index 93a4dec73fa..00000000000
--- a/srcpkgs/qt-webkit/files/fix-execinfo.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- qtwebkit-2.3.4/Source/WTF/wtf/Assertions.cpp 2014-09-24 13:42:05.000000000 +0200
-+++ qtwebkit-2.3.4/Source/WTF/wtf/Assertions.cpp 2016-09-17 23:37:12.846758706 +0200
-@@ -58,7 +58,7 @@
- #include <windows.h>
- #endif
-
--#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
-+#if (OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__))) && !OS(ANDROID)
- #include <cxxabi.h>
- #include <dlfcn.h>
- #include <execinfo.h>
-@@ -242,7 +242,7 @@
-
- void WTFGetBacktrace(void** stack, int* size)
- {
--#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
-+#if (OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__))) && !OS(ANDROID)
- *size = backtrace(stack, *size);
- #elif OS(WINDOWS) && !OS(WINCE)
- // The CaptureStackBackTrace function is available in XP, but it is not defined
diff --git a/srcpkgs/qt-webkit/files/fix-gcc6.patch b/srcpkgs/qt-webkit/files/fix-gcc6.patch
deleted file mode 100644
index 6e6215c7e25..00000000000
--- a/srcpkgs/qt-webkit/files/fix-gcc6.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- webkit-qtwebkit-23/Source/JavaScriptCore/runtime/JSObject.cpp.gcc5 2014-09-24 06:42:05.000000000 -0500
-+++ webkit-qtwebkit-23/Source/JavaScriptCore/runtime/JSObject.cpp 2015-03-20 08:15:53.192778375 -0500
-@@ -1922,6 +1922,10 @@ void JSObject::putByIndexBeyondVectorLen
- }
- }
-
-+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<ContiguousShape>(ExecState* exec, unsigned i, JSValue value);
-+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<DoubleShape>(ExecState* exec, unsigned i, JSValue value);
-+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<Int32Shape>(ExecState* exec, unsigned i, JSValue value);
-+
- void JSObject::putByIndexBeyondVectorLengthWithArrayStorage(ExecState* exec, unsigned i, JSValue value, bool shouldThrow, ArrayStorage* storage)
- {
- JSGlobalData& globalData = exec->globalData();
-
diff --git a/srcpkgs/qt-webkit/files/fix-mallinfo.patch b/srcpkgs/qt-webkit/files/fix-mallinfo.patch
deleted file mode 100644
index 60c5d085fe0..00000000000
--- a/srcpkgs/qt-webkit/files/fix-mallinfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qtwebkit-2.3.4/Source/WebCore/platform/qt/MemoryUsageSupportQt.cpp 2014-09-24 13:42:05.000000000 +0200
-+++ qtwebkit-2.3.4/Source/WebCore/platform/qt/MemoryUsageSupportQt.cpp 2016-09-17 23:48:23.558775636 +0200
-@@ -31,7 +31,7 @@
-
- namespace WebCore {
-
--#if OS(LINUX)
-+#if OS(LINUX) && defined(__GLIBC__)
- static size_t mallocMemoryUsage(bool inuse)
- {
- // Return how much memory (in bytes) has been allocated on the system heap.
diff --git a/srcpkgs/qt-webkit/files/fix-saturated_arithmetic.patch b/srcpkgs/qt-webkit/files/fix-saturated_arithmetic.patch
deleted file mode 100644
index f9a18220a99..00000000000
--- a/srcpkgs/qt-webkit/files/fix-saturated_arithmetic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- qtwebkit-2.3.4/Source/WTF/wtf/SaturatedArithmetic.h 2014-09-24 13:42:05.000000000 +0200
-+++ qtwebkit-2.3.4/Source/WTF/wtf/SaturatedArithmetic.h 2017-02-19 16:27:58.343676787 +0100
-@@ -43,7 +43,7 @@
-
- // Can only overflow if the signed bit of the two values match. If the signed
- // bit of the result and one of the values differ it did overflow.
-- if (!((ua ^ ub) >> 31) & (result ^ ua) >> 31)
-+ if (~((ua ^ ub) >> 31) & ((result ^ ua) >> 31))
- result = std::numeric_limits<int>::max() + (ua >> 31);
-
- return result;
-@@ -57,7 +57,7 @@
-
- // Can only overflow if the signed bit of the two values do not match. If the
- // signed bit of the result and the first value differ it did overflow.
-- if ((ua ^ ub) >> 31 & (result ^ ua) >> 31)
-+ if (((ua ^ ub) >> 31) & ((result ^ ua) >> 31))
- result = std::numeric_limits<int>::max() + (ua >> 31);
-
- return result;
diff --git a/srcpkgs/qt-webkit/files/qwebview.patch b/srcpkgs/qt-webkit/files/qwebview.patch
deleted file mode 100644
index f8aa8c3101b..00000000000
--- a/srcpkgs/qt-webkit/files/qwebview.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- qt-everywhere-opensource-src-4.8.7/tools/designer/src/plugins/plugins.pri~ 2013-01-09 12:56:08.915412090 +0000
-+++ qt-everywhere-opensource-src-4.8.7/tools/designer/src/plugins/plugins.pri 2013-01-09 12:58:06.911391299 +0000
-@@ -1,3 +1,6 @@
-+INCLUDEPATH += ../../../../../../qtwebkit-2.3.4/WebKitBuild/Release/include
-+LIBS += -L../../../../../../qtwebkit-2.3.4/WebKitBuild/Release/lib
-+
- CONFIG += designer
- win32|mac: CONFIG+= debug_and_release
- QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/designer
---- qt-everywhere-opensource-src-4.8.7/tools/designer/src/plugins/plugins.pro~ 2013-01-09 12:55:43.598892405 +0000
-+++ qt-everywhere-opensource-src-4.8.7/tools/designer/src/plugins/plugins.pro 2013-01-09 12:55:53.352169136 +0000
-@@ -2,9 +2,4 @@
- CONFIG += ordered
-
- REQUIRES = !CONFIG(static,shared|static)
--contains(QT_CONFIG, qt3support): SUBDIRS += widgets
--win32: SUBDIRS += activeqt
--# contains(QT_CONFIG, opengl): SUBDIRS += tools/view3d
- contains(QT_CONFIG, webkit): SUBDIRS += qwebview
--contains(QT_CONFIG, phonon): SUBDIRS += phononwidgets
--contains(QT_CONFIG, declarative): SUBDIRS += qdeclarativeview
diff --git a/srcpkgs/qt-webkit/template b/srcpkgs/qt-webkit/template
index 1c3ff6c0ee2..ecaa15fcd16 100644
--- a/srcpkgs/qt-webkit/template
+++ b/srcpkgs/qt-webkit/template
@@ -1,113 +1,11 @@
# Template file for 'qt-webkit'
pkgname=qt-webkit
version=2.3.4
-revision=7
-_qtver=4.8.7
-wrksrc="qtwebkit-${version}"
-create_wrksrc=yes
-hostmakedepends="automake libtool bison flex gperf python ruby pkg-config qt-qmake"
-makedepends="MesaLib-devel libjpeg-turbo-devel qt-devel qt-designer-devel
- glib-devel fontconfig-devel gst-plugins-base1-devel sqlite-devel libXrender-devel"
-short_desc="Open source web browser engine (Qt4 port)"
+revision=8
+build_style=meta
+short_desc="Open source web browser engine (Qt4 port) (removed package)"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="LGPL-2.1, GPL-3"
+license="BSD-2-Clause"
homepage="http://trac.webkit.org/wiki/QtWebKit"
-distfiles="
- http://download.kde.org/stable/qtwebkit-${version%.*}/${version}/src/qtwebkit-${version}.tar.gz
- http://download.qt.io/official_releases/qt/${_qtver%.*}/${_qtver}/qt-everywhere-opensource-src-${_qtver}.tar.gz"
-checksum="
- c6cfa9d068f7eb024fee3f6c24f5b8b726997f669007587f35ed4a97d40097ca
- e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0"
conflicts="qt<4.8.7_12"
-
-if [ -n "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt-devel qt-designer-devel"
-fi
-
-# Use the same value for -std= as in qt
-CXXFLAGS="-std=gnu++98 -Wno-deprecated -fno-delete-null-pointer-checks -fno-lifetime-dse"
-
-post_extract() {
- patch -p1 < ${FILESDIR}/fix-gcc6.patch
- patch -p1 < ${FILESDIR}/fix-execinfo.patch
- patch -p1 < ${FILESDIR}/fix-mallinfo.patch
- patch -p0 < ${FILESDIR}/qwebview.patch
- mv qt-everywhere-opensource-src-${_qtver} ..
-}
-
-do_configure() {
- :
-}
-
-do_build() {
- local opts="--qt --prefix=/usr --no-webkit2 --release"
- case "$XBPS_TARGET_MACHINE" in
- i686*) # Do not force SSE2 for i686
- opts+=" --no-force-sse2"
- ;;
- aarch64*)
- # Disable JIT
- opts+=" DEFINES+=ENABLE_JIT=0"
- opts+=" DEFINES+=ENABLE_YARR_JIT=0"
- ;;
- arm*|mips*|ppc*)
- # Disable JIT and assembler
- opts+=" DEFINES+=ENABLE_JIT=0"
- opts+=" DEFINES+=ENABLE_YARR_JIT=0"
- opts+=" DEFINES+=ENABLE_ASSEMBLER=0"
- ;;
- esac
- if [ -n "$CROSS_BUILD" ]; then
- opts+=" --qmakearg=\"CONFIG+=production_build\""
- opts+=" --qmakearg=\"QMAKE_CC=$CC\""
- opts+=" --qmakearg=\"QMAKE_CXX=$CXX\""
- opts+=" --qmakearg=\"QMAKE_LINK=$CXX\""
- opts+=" --qmakearg=\"QMAKE_LINK_SHARED=$CXX\""
- opts+=" --qmakearg=\"QMAKE_AR=$AR cru\""
- opts+=" --qmakearg=\"QMAKE_OBJDUMP=$OBJDUMP\""
- opts+=" --qmakearg=\"QMAKE_CFLAGS='$CFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_CFLAGS_RELEASE='$CFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_CXXFLAGS='$CXXFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_CXXFLAGS_RELEASE='$CXXFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_LFLAGS='$LDFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_LFLAGS_RELEASE='$LDFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_INCDIR=${XBPS_CROSS_BASE}/usr/include\""
- opts+=" --qmakearg=\"QMAKE_INCDIR_QT=${XBPS_CROSS_BASE}/usr/include\""
- fi
- export QTDIR=/usr
- export PATH="/usr/lib/qt/bin:$PATH"
- find -name "Makefile*" -exec sed -i "{}" \
- -e"s;^\(CC[ ]*=\).*;\1 $CC;" \
- -e"s;^\(CXX[ ]*=\).*;\1 $CXX;" \
- -e"s;^\(LINK[ ]*=\).*;\1 $CXX;" \
- -e"s;^\(CFLAGS[ ]*=\)\(.*\);\1 \2 $CFLAGS;" \
- -e"s;^\(CXXFLAGS[ ]*=\)\(.*\);\1 \2 $CXXFLAGS;" \
- -e"s;^\(LFLAGS[ ]*=\)\(.*\);\1 \2 $LDFLAGS;" \
- \;
- Tools/Scripts/build-webkit --makeargs="${makejobs}" ${opts}
- cd ../qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview
- qmake QMAKE_CFLAGS="$CFLAGS" QMAKE_CXXFLAGS="$CXXFLAGS" QMAKE_LFLAGS="$LDFLAGS"
- make ${makejobs} CC="$CC" CXX="$CXX" LINK="$CXX"
-}
-
-do_install() {
- make INSTALL_ROOT="${DESTDIR}" -C WebKitBuild/Release install
- cd ../qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview
- make INSTALL_ROOT="${DESTDIR}" install
-
- # Remove references to the build directory from .prl and .pc files
- sed -i 's| -L.*/*/release||g' ${DESTDIR}/usr/lib/pkgconfig/QtWebKit.pc
- sed -i '/^QMAKE_PRL_BUILD_DIR/d' ${DESTDIR}/usr/lib/libQtWebKit.prl
-}
-
-qt-webkit-devel_package() {
- short_desc+=" - development files"
- depends="qt-devel ${sourcepkg}>=${version}_${revision}"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/*.so
- vmove usr/lib/*.prl
- vmove usr/lib/pkgconfig
- vmove usr/share/qt/mkspecs
- }
-}
+replaces="qt-webkit-devel>=0"
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] qt-webkit: remove
2019-09-17 12:40 [PR PATCH] qt-webkit: remove voidlinux-github
` (2 preceding siblings ...)
2019-09-17 12:44 ` [PR PATCH] [Updated] [WIP] " voidlinux-github
@ 2019-09-17 12:44 ` voidlinux-github
2019-09-17 12:59 ` [PR PATCH] [Updated] [WIP] qt: remove voidlinux-github
` (6 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: voidlinux-github @ 2019-09-17 12:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 411 bytes --]
There is an updated pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages qt-webkit
https://github.com/void-linux/void-packages/pull/14520
[WIP] qt-webkit: remove
there are also a few python-PyQt4-* packages in the binary repos that have to be removed
A patch file from https://github.com/void-linux/void-packages/pull/14520.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt-webkit-14520.patch --]
[-- Type: text/x-diff, Size: 12014 bytes --]
From 3ae3b4f5b6a5b4fbf7ade15c7176e02f110714c3 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Tue, 17 Sep 2019 14:33:08 +0200
Subject: [PATCH] qt-webkit: remove
---
common/shlibs | 1 -
srcpkgs/qt-webkit-devel | 1 -
srcpkgs/qt-webkit/INSTALL.msg | 1 +
srcpkgs/qt-webkit/files/fix-execinfo.patch | 20 ----
srcpkgs/qt-webkit/files/fix-gcc6.patch | 14 ---
srcpkgs/qt-webkit/files/fix-mallinfo.patch | 11 --
.../files/fix-saturated_arithmetic.patch | 20 ----
srcpkgs/qt-webkit/files/qwebview.patch | 21 ----
srcpkgs/qt-webkit/template | 112 +-----------------
9 files changed, 6 insertions(+), 195 deletions(-)
delete mode 120000 srcpkgs/qt-webkit-devel
create mode 100644 srcpkgs/qt-webkit/INSTALL.msg
delete mode 100644 srcpkgs/qt-webkit/files/fix-execinfo.patch
delete mode 100644 srcpkgs/qt-webkit/files/fix-gcc6.patch
delete mode 100644 srcpkgs/qt-webkit/files/fix-mallinfo.patch
delete mode 100644 srcpkgs/qt-webkit/files/fix-saturated_arithmetic.patch
delete mode 100644 srcpkgs/qt-webkit/files/qwebview.patch
diff --git a/common/shlibs b/common/shlibs
index d15941dce29..58260aabca0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -456,7 +456,6 @@ libQtSql.so.4 qt-4.5.3_1
libQtDeclarative.so.4 qt-4.5.3_1
libQtDesignerComponents.so.4 qt-designer-libs-4.7.8_13
libQtDesigner.so.4 qt-designer-libs-4.7.8_13
-libQtWebKit.so.4 qt-webkit-2.3.4_1
libsysfs.so.2 libsysfs-2.1.0_1
libsensors.so.5 libsensors-3.5.0_1
libcap-ng.so.0 libcap-ng-0.6.2_1
diff --git a/srcpkgs/qt-webkit-devel b/srcpkgs/qt-webkit-devel
deleted file mode 120000
index f3c82c42591..00000000000
--- a/srcpkgs/qt-webkit-devel
+++ /dev/null
@@ -1 +0,0 @@
-qt-webkit
\ No newline at end of file
diff --git a/srcpkgs/qt-webkit/INSTALL.msg b/srcpkgs/qt-webkit/INSTALL.msg
new file mode 100644
index 00000000000..07765985647
--- /dev/null
+++ b/srcpkgs/qt-webkit/INSTALL.msg
@@ -0,0 +1 @@
+qt-webkit is no longer provided by Void Linux, and will be fully removed from the repos on 2019-12-17
diff --git a/srcpkgs/qt-webkit/files/fix-execinfo.patch b/srcpkgs/qt-webkit/files/fix-execinfo.patch
deleted file mode 100644
index 93a4dec73fa..00000000000
--- a/srcpkgs/qt-webkit/files/fix-execinfo.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- qtwebkit-2.3.4/Source/WTF/wtf/Assertions.cpp 2014-09-24 13:42:05.000000000 +0200
-+++ qtwebkit-2.3.4/Source/WTF/wtf/Assertions.cpp 2016-09-17 23:37:12.846758706 +0200
-@@ -58,7 +58,7 @@
- #include <windows.h>
- #endif
-
--#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
-+#if (OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__))) && !OS(ANDROID)
- #include <cxxabi.h>
- #include <dlfcn.h>
- #include <execinfo.h>
-@@ -242,7 +242,7 @@
-
- void WTFGetBacktrace(void** stack, int* size)
- {
--#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
-+#if (OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__))) && !OS(ANDROID)
- *size = backtrace(stack, *size);
- #elif OS(WINDOWS) && !OS(WINCE)
- // The CaptureStackBackTrace function is available in XP, but it is not defined
diff --git a/srcpkgs/qt-webkit/files/fix-gcc6.patch b/srcpkgs/qt-webkit/files/fix-gcc6.patch
deleted file mode 100644
index 6e6215c7e25..00000000000
--- a/srcpkgs/qt-webkit/files/fix-gcc6.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- webkit-qtwebkit-23/Source/JavaScriptCore/runtime/JSObject.cpp.gcc5 2014-09-24 06:42:05.000000000 -0500
-+++ webkit-qtwebkit-23/Source/JavaScriptCore/runtime/JSObject.cpp 2015-03-20 08:15:53.192778375 -0500
-@@ -1922,6 +1922,10 @@ void JSObject::putByIndexBeyondVectorLen
- }
- }
-
-+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<ContiguousShape>(ExecState* exec, unsigned i, JSValue value);
-+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<DoubleShape>(ExecState* exec, unsigned i, JSValue value);
-+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<Int32Shape>(ExecState* exec, unsigned i, JSValue value);
-+
- void JSObject::putByIndexBeyondVectorLengthWithArrayStorage(ExecState* exec, unsigned i, JSValue value, bool shouldThrow, ArrayStorage* storage)
- {
- JSGlobalData& globalData = exec->globalData();
-
diff --git a/srcpkgs/qt-webkit/files/fix-mallinfo.patch b/srcpkgs/qt-webkit/files/fix-mallinfo.patch
deleted file mode 100644
index 60c5d085fe0..00000000000
--- a/srcpkgs/qt-webkit/files/fix-mallinfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qtwebkit-2.3.4/Source/WebCore/platform/qt/MemoryUsageSupportQt.cpp 2014-09-24 13:42:05.000000000 +0200
-+++ qtwebkit-2.3.4/Source/WebCore/platform/qt/MemoryUsageSupportQt.cpp 2016-09-17 23:48:23.558775636 +0200
-@@ -31,7 +31,7 @@
-
- namespace WebCore {
-
--#if OS(LINUX)
-+#if OS(LINUX) && defined(__GLIBC__)
- static size_t mallocMemoryUsage(bool inuse)
- {
- // Return how much memory (in bytes) has been allocated on the system heap.
diff --git a/srcpkgs/qt-webkit/files/fix-saturated_arithmetic.patch b/srcpkgs/qt-webkit/files/fix-saturated_arithmetic.patch
deleted file mode 100644
index f9a18220a99..00000000000
--- a/srcpkgs/qt-webkit/files/fix-saturated_arithmetic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- qtwebkit-2.3.4/Source/WTF/wtf/SaturatedArithmetic.h 2014-09-24 13:42:05.000000000 +0200
-+++ qtwebkit-2.3.4/Source/WTF/wtf/SaturatedArithmetic.h 2017-02-19 16:27:58.343676787 +0100
-@@ -43,7 +43,7 @@
-
- // Can only overflow if the signed bit of the two values match. If the signed
- // bit of the result and one of the values differ it did overflow.
-- if (!((ua ^ ub) >> 31) & (result ^ ua) >> 31)
-+ if (~((ua ^ ub) >> 31) & ((result ^ ua) >> 31))
- result = std::numeric_limits<int>::max() + (ua >> 31);
-
- return result;
-@@ -57,7 +57,7 @@
-
- // Can only overflow if the signed bit of the two values do not match. If the
- // signed bit of the result and the first value differ it did overflow.
-- if ((ua ^ ub) >> 31 & (result ^ ua) >> 31)
-+ if (((ua ^ ub) >> 31) & ((result ^ ua) >> 31))
- result = std::numeric_limits<int>::max() + (ua >> 31);
-
- return result;
diff --git a/srcpkgs/qt-webkit/files/qwebview.patch b/srcpkgs/qt-webkit/files/qwebview.patch
deleted file mode 100644
index f8aa8c3101b..00000000000
--- a/srcpkgs/qt-webkit/files/qwebview.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- qt-everywhere-opensource-src-4.8.7/tools/designer/src/plugins/plugins.pri~ 2013-01-09 12:56:08.915412090 +0000
-+++ qt-everywhere-opensource-src-4.8.7/tools/designer/src/plugins/plugins.pri 2013-01-09 12:58:06.911391299 +0000
-@@ -1,3 +1,6 @@
-+INCLUDEPATH += ../../../../../../qtwebkit-2.3.4/WebKitBuild/Release/include
-+LIBS += -L../../../../../../qtwebkit-2.3.4/WebKitBuild/Release/lib
-+
- CONFIG += designer
- win32|mac: CONFIG+= debug_and_release
- QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/designer
---- qt-everywhere-opensource-src-4.8.7/tools/designer/src/plugins/plugins.pro~ 2013-01-09 12:55:43.598892405 +0000
-+++ qt-everywhere-opensource-src-4.8.7/tools/designer/src/plugins/plugins.pro 2013-01-09 12:55:53.352169136 +0000
-@@ -2,9 +2,4 @@
- CONFIG += ordered
-
- REQUIRES = !CONFIG(static,shared|static)
--contains(QT_CONFIG, qt3support): SUBDIRS += widgets
--win32: SUBDIRS += activeqt
--# contains(QT_CONFIG, opengl): SUBDIRS += tools/view3d
- contains(QT_CONFIG, webkit): SUBDIRS += qwebview
--contains(QT_CONFIG, phonon): SUBDIRS += phononwidgets
--contains(QT_CONFIG, declarative): SUBDIRS += qdeclarativeview
diff --git a/srcpkgs/qt-webkit/template b/srcpkgs/qt-webkit/template
index 1c3ff6c0ee2..ecaa15fcd16 100644
--- a/srcpkgs/qt-webkit/template
+++ b/srcpkgs/qt-webkit/template
@@ -1,113 +1,11 @@
# Template file for 'qt-webkit'
pkgname=qt-webkit
version=2.3.4
-revision=7
-_qtver=4.8.7
-wrksrc="qtwebkit-${version}"
-create_wrksrc=yes
-hostmakedepends="automake libtool bison flex gperf python ruby pkg-config qt-qmake"
-makedepends="MesaLib-devel libjpeg-turbo-devel qt-devel qt-designer-devel
- glib-devel fontconfig-devel gst-plugins-base1-devel sqlite-devel libXrender-devel"
-short_desc="Open source web browser engine (Qt4 port)"
+revision=8
+build_style=meta
+short_desc="Open source web browser engine (Qt4 port) (removed package)"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="LGPL-2.1, GPL-3"
+license="BSD-2-Clause"
homepage="http://trac.webkit.org/wiki/QtWebKit"
-distfiles="
- http://download.kde.org/stable/qtwebkit-${version%.*}/${version}/src/qtwebkit-${version}.tar.gz
- http://download.qt.io/official_releases/qt/${_qtver%.*}/${_qtver}/qt-everywhere-opensource-src-${_qtver}.tar.gz"
-checksum="
- c6cfa9d068f7eb024fee3f6c24f5b8b726997f669007587f35ed4a97d40097ca
- e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0"
conflicts="qt<4.8.7_12"
-
-if [ -n "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt-devel qt-designer-devel"
-fi
-
-# Use the same value for -std= as in qt
-CXXFLAGS="-std=gnu++98 -Wno-deprecated -fno-delete-null-pointer-checks -fno-lifetime-dse"
-
-post_extract() {
- patch -p1 < ${FILESDIR}/fix-gcc6.patch
- patch -p1 < ${FILESDIR}/fix-execinfo.patch
- patch -p1 < ${FILESDIR}/fix-mallinfo.patch
- patch -p0 < ${FILESDIR}/qwebview.patch
- mv qt-everywhere-opensource-src-${_qtver} ..
-}
-
-do_configure() {
- :
-}
-
-do_build() {
- local opts="--qt --prefix=/usr --no-webkit2 --release"
- case "$XBPS_TARGET_MACHINE" in
- i686*) # Do not force SSE2 for i686
- opts+=" --no-force-sse2"
- ;;
- aarch64*)
- # Disable JIT
- opts+=" DEFINES+=ENABLE_JIT=0"
- opts+=" DEFINES+=ENABLE_YARR_JIT=0"
- ;;
- arm*|mips*|ppc*)
- # Disable JIT and assembler
- opts+=" DEFINES+=ENABLE_JIT=0"
- opts+=" DEFINES+=ENABLE_YARR_JIT=0"
- opts+=" DEFINES+=ENABLE_ASSEMBLER=0"
- ;;
- esac
- if [ -n "$CROSS_BUILD" ]; then
- opts+=" --qmakearg=\"CONFIG+=production_build\""
- opts+=" --qmakearg=\"QMAKE_CC=$CC\""
- opts+=" --qmakearg=\"QMAKE_CXX=$CXX\""
- opts+=" --qmakearg=\"QMAKE_LINK=$CXX\""
- opts+=" --qmakearg=\"QMAKE_LINK_SHARED=$CXX\""
- opts+=" --qmakearg=\"QMAKE_AR=$AR cru\""
- opts+=" --qmakearg=\"QMAKE_OBJDUMP=$OBJDUMP\""
- opts+=" --qmakearg=\"QMAKE_CFLAGS='$CFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_CFLAGS_RELEASE='$CFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_CXXFLAGS='$CXXFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_CXXFLAGS_RELEASE='$CXXFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_LFLAGS='$LDFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_LFLAGS_RELEASE='$LDFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_INCDIR=${XBPS_CROSS_BASE}/usr/include\""
- opts+=" --qmakearg=\"QMAKE_INCDIR_QT=${XBPS_CROSS_BASE}/usr/include\""
- fi
- export QTDIR=/usr
- export PATH="/usr/lib/qt/bin:$PATH"
- find -name "Makefile*" -exec sed -i "{}" \
- -e"s;^\(CC[ ]*=\).*;\1 $CC;" \
- -e"s;^\(CXX[ ]*=\).*;\1 $CXX;" \
- -e"s;^\(LINK[ ]*=\).*;\1 $CXX;" \
- -e"s;^\(CFLAGS[ ]*=\)\(.*\);\1 \2 $CFLAGS;" \
- -e"s;^\(CXXFLAGS[ ]*=\)\(.*\);\1 \2 $CXXFLAGS;" \
- -e"s;^\(LFLAGS[ ]*=\)\(.*\);\1 \2 $LDFLAGS;" \
- \;
- Tools/Scripts/build-webkit --makeargs="${makejobs}" ${opts}
- cd ../qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview
- qmake QMAKE_CFLAGS="$CFLAGS" QMAKE_CXXFLAGS="$CXXFLAGS" QMAKE_LFLAGS="$LDFLAGS"
- make ${makejobs} CC="$CC" CXX="$CXX" LINK="$CXX"
-}
-
-do_install() {
- make INSTALL_ROOT="${DESTDIR}" -C WebKitBuild/Release install
- cd ../qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview
- make INSTALL_ROOT="${DESTDIR}" install
-
- # Remove references to the build directory from .prl and .pc files
- sed -i 's| -L.*/*/release||g' ${DESTDIR}/usr/lib/pkgconfig/QtWebKit.pc
- sed -i '/^QMAKE_PRL_BUILD_DIR/d' ${DESTDIR}/usr/lib/libQtWebKit.prl
-}
-
-qt-webkit-devel_package() {
- short_desc+=" - development files"
- depends="qt-devel ${sourcepkg}>=${version}_${revision}"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/*.so
- vmove usr/lib/*.prl
- vmove usr/lib/pkgconfig
- vmove usr/share/qt/mkspecs
- }
-}
+replaces="qt-webkit-devel>=0"
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] qt: remove
2019-09-17 12:40 [PR PATCH] qt-webkit: remove voidlinux-github
` (4 preceding siblings ...)
2019-09-17 12:59 ` [PR PATCH] [Updated] [WIP] qt: remove voidlinux-github
@ 2019-09-17 12:59 ` voidlinux-github
2019-09-17 13:11 ` voidlinux-github
` (4 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: voidlinux-github @ 2019-09-17 12:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 427 bytes --]
There is an updated pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages qt-webkit
https://github.com/void-linux/void-packages/pull/14520
[WIP] qt: remove
there are also a few python*-PyQt4-* packages in the binary repos that have to be removed.
And python3-pyside*
A patch file from https://github.com/void-linux/void-packages/pull/14520.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt-webkit-14520.patch --]
[-- Type: text/x-diff, Size: 18523 bytes --]
From 3ae3b4f5b6a5b4fbf7ade15c7176e02f110714c3 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Tue, 17 Sep 2019 14:33:08 +0200
Subject: [PATCH 1/4] qt-webkit: remove
---
common/shlibs | 1 -
srcpkgs/qt-webkit-devel | 1 -
srcpkgs/qt-webkit/INSTALL.msg | 1 +
srcpkgs/qt-webkit/files/fix-execinfo.patch | 20 ----
srcpkgs/qt-webkit/files/fix-gcc6.patch | 14 ---
srcpkgs/qt-webkit/files/fix-mallinfo.patch | 11 --
.../files/fix-saturated_arithmetic.patch | 20 ----
srcpkgs/qt-webkit/files/qwebview.patch | 21 ----
srcpkgs/qt-webkit/template | 112 +-----------------
9 files changed, 6 insertions(+), 195 deletions(-)
delete mode 120000 srcpkgs/qt-webkit-devel
create mode 100644 srcpkgs/qt-webkit/INSTALL.msg
delete mode 100644 srcpkgs/qt-webkit/files/fix-execinfo.patch
delete mode 100644 srcpkgs/qt-webkit/files/fix-gcc6.patch
delete mode 100644 srcpkgs/qt-webkit/files/fix-mallinfo.patch
delete mode 100644 srcpkgs/qt-webkit/files/fix-saturated_arithmetic.patch
delete mode 100644 srcpkgs/qt-webkit/files/qwebview.patch
diff --git a/common/shlibs b/common/shlibs
index d15941dce29..58260aabca0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -456,7 +456,6 @@ libQtSql.so.4 qt-4.5.3_1
libQtDeclarative.so.4 qt-4.5.3_1
libQtDesignerComponents.so.4 qt-designer-libs-4.7.8_13
libQtDesigner.so.4 qt-designer-libs-4.7.8_13
-libQtWebKit.so.4 qt-webkit-2.3.4_1
libsysfs.so.2 libsysfs-2.1.0_1
libsensors.so.5 libsensors-3.5.0_1
libcap-ng.so.0 libcap-ng-0.6.2_1
diff --git a/srcpkgs/qt-webkit-devel b/srcpkgs/qt-webkit-devel
deleted file mode 120000
index f3c82c42591..00000000000
--- a/srcpkgs/qt-webkit-devel
+++ /dev/null
@@ -1 +0,0 @@
-qt-webkit
\ No newline at end of file
diff --git a/srcpkgs/qt-webkit/INSTALL.msg b/srcpkgs/qt-webkit/INSTALL.msg
new file mode 100644
index 00000000000..07765985647
--- /dev/null
+++ b/srcpkgs/qt-webkit/INSTALL.msg
@@ -0,0 +1 @@
+qt-webkit is no longer provided by Void Linux, and will be fully removed from the repos on 2019-12-17
diff --git a/srcpkgs/qt-webkit/files/fix-execinfo.patch b/srcpkgs/qt-webkit/files/fix-execinfo.patch
deleted file mode 100644
index 93a4dec73fa..00000000000
--- a/srcpkgs/qt-webkit/files/fix-execinfo.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- qtwebkit-2.3.4/Source/WTF/wtf/Assertions.cpp 2014-09-24 13:42:05.000000000 +0200
-+++ qtwebkit-2.3.4/Source/WTF/wtf/Assertions.cpp 2016-09-17 23:37:12.846758706 +0200
-@@ -58,7 +58,7 @@
- #include <windows.h>
- #endif
-
--#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
-+#if (OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__))) && !OS(ANDROID)
- #include <cxxabi.h>
- #include <dlfcn.h>
- #include <execinfo.h>
-@@ -242,7 +242,7 @@
-
- void WTFGetBacktrace(void** stack, int* size)
- {
--#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
-+#if (OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__))) && !OS(ANDROID)
- *size = backtrace(stack, *size);
- #elif OS(WINDOWS) && !OS(WINCE)
- // The CaptureStackBackTrace function is available in XP, but it is not defined
diff --git a/srcpkgs/qt-webkit/files/fix-gcc6.patch b/srcpkgs/qt-webkit/files/fix-gcc6.patch
deleted file mode 100644
index 6e6215c7e25..00000000000
--- a/srcpkgs/qt-webkit/files/fix-gcc6.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- webkit-qtwebkit-23/Source/JavaScriptCore/runtime/JSObject.cpp.gcc5 2014-09-24 06:42:05.000000000 -0500
-+++ webkit-qtwebkit-23/Source/JavaScriptCore/runtime/JSObject.cpp 2015-03-20 08:15:53.192778375 -0500
-@@ -1922,6 +1922,10 @@ void JSObject::putByIndexBeyondVectorLen
- }
- }
-
-+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<ContiguousShape>(ExecState* exec, unsigned i, JSValue value);
-+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<DoubleShape>(ExecState* exec, unsigned i, JSValue value);
-+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<Int32Shape>(ExecState* exec, unsigned i, JSValue value);
-+
- void JSObject::putByIndexBeyondVectorLengthWithArrayStorage(ExecState* exec, unsigned i, JSValue value, bool shouldThrow, ArrayStorage* storage)
- {
- JSGlobalData& globalData = exec->globalData();
-
diff --git a/srcpkgs/qt-webkit/files/fix-mallinfo.patch b/srcpkgs/qt-webkit/files/fix-mallinfo.patch
deleted file mode 100644
index 60c5d085fe0..00000000000
--- a/srcpkgs/qt-webkit/files/fix-mallinfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qtwebkit-2.3.4/Source/WebCore/platform/qt/MemoryUsageSupportQt.cpp 2014-09-24 13:42:05.000000000 +0200
-+++ qtwebkit-2.3.4/Source/WebCore/platform/qt/MemoryUsageSupportQt.cpp 2016-09-17 23:48:23.558775636 +0200
-@@ -31,7 +31,7 @@
-
- namespace WebCore {
-
--#if OS(LINUX)
-+#if OS(LINUX) && defined(__GLIBC__)
- static size_t mallocMemoryUsage(bool inuse)
- {
- // Return how much memory (in bytes) has been allocated on the system heap.
diff --git a/srcpkgs/qt-webkit/files/fix-saturated_arithmetic.patch b/srcpkgs/qt-webkit/files/fix-saturated_arithmetic.patch
deleted file mode 100644
index f9a18220a99..00000000000
--- a/srcpkgs/qt-webkit/files/fix-saturated_arithmetic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- qtwebkit-2.3.4/Source/WTF/wtf/SaturatedArithmetic.h 2014-09-24 13:42:05.000000000 +0200
-+++ qtwebkit-2.3.4/Source/WTF/wtf/SaturatedArithmetic.h 2017-02-19 16:27:58.343676787 +0100
-@@ -43,7 +43,7 @@
-
- // Can only overflow if the signed bit of the two values match. If the signed
- // bit of the result and one of the values differ it did overflow.
-- if (!((ua ^ ub) >> 31) & (result ^ ua) >> 31)
-+ if (~((ua ^ ub) >> 31) & ((result ^ ua) >> 31))
- result = std::numeric_limits<int>::max() + (ua >> 31);
-
- return result;
-@@ -57,7 +57,7 @@
-
- // Can only overflow if the signed bit of the two values do not match. If the
- // signed bit of the result and the first value differ it did overflow.
-- if ((ua ^ ub) >> 31 & (result ^ ua) >> 31)
-+ if (((ua ^ ub) >> 31) & ((result ^ ua) >> 31))
- result = std::numeric_limits<int>::max() + (ua >> 31);
-
- return result;
diff --git a/srcpkgs/qt-webkit/files/qwebview.patch b/srcpkgs/qt-webkit/files/qwebview.patch
deleted file mode 100644
index f8aa8c3101b..00000000000
--- a/srcpkgs/qt-webkit/files/qwebview.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- qt-everywhere-opensource-src-4.8.7/tools/designer/src/plugins/plugins.pri~ 2013-01-09 12:56:08.915412090 +0000
-+++ qt-everywhere-opensource-src-4.8.7/tools/designer/src/plugins/plugins.pri 2013-01-09 12:58:06.911391299 +0000
-@@ -1,3 +1,6 @@
-+INCLUDEPATH += ../../../../../../qtwebkit-2.3.4/WebKitBuild/Release/include
-+LIBS += -L../../../../../../qtwebkit-2.3.4/WebKitBuild/Release/lib
-+
- CONFIG += designer
- win32|mac: CONFIG+= debug_and_release
- QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/designer
---- qt-everywhere-opensource-src-4.8.7/tools/designer/src/plugins/plugins.pro~ 2013-01-09 12:55:43.598892405 +0000
-+++ qt-everywhere-opensource-src-4.8.7/tools/designer/src/plugins/plugins.pro 2013-01-09 12:55:53.352169136 +0000
-@@ -2,9 +2,4 @@
- CONFIG += ordered
-
- REQUIRES = !CONFIG(static,shared|static)
--contains(QT_CONFIG, qt3support): SUBDIRS += widgets
--win32: SUBDIRS += activeqt
--# contains(QT_CONFIG, opengl): SUBDIRS += tools/view3d
- contains(QT_CONFIG, webkit): SUBDIRS += qwebview
--contains(QT_CONFIG, phonon): SUBDIRS += phononwidgets
--contains(QT_CONFIG, declarative): SUBDIRS += qdeclarativeview
diff --git a/srcpkgs/qt-webkit/template b/srcpkgs/qt-webkit/template
index 1c3ff6c0ee2..ecaa15fcd16 100644
--- a/srcpkgs/qt-webkit/template
+++ b/srcpkgs/qt-webkit/template
@@ -1,113 +1,11 @@
# Template file for 'qt-webkit'
pkgname=qt-webkit
version=2.3.4
-revision=7
-_qtver=4.8.7
-wrksrc="qtwebkit-${version}"
-create_wrksrc=yes
-hostmakedepends="automake libtool bison flex gperf python ruby pkg-config qt-qmake"
-makedepends="MesaLib-devel libjpeg-turbo-devel qt-devel qt-designer-devel
- glib-devel fontconfig-devel gst-plugins-base1-devel sqlite-devel libXrender-devel"
-short_desc="Open source web browser engine (Qt4 port)"
+revision=8
+build_style=meta
+short_desc="Open source web browser engine (Qt4 port) (removed package)"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="LGPL-2.1, GPL-3"
+license="BSD-2-Clause"
homepage="http://trac.webkit.org/wiki/QtWebKit"
-distfiles="
- http://download.kde.org/stable/qtwebkit-${version%.*}/${version}/src/qtwebkit-${version}.tar.gz
- http://download.qt.io/official_releases/qt/${_qtver%.*}/${_qtver}/qt-everywhere-opensource-src-${_qtver}.tar.gz"
-checksum="
- c6cfa9d068f7eb024fee3f6c24f5b8b726997f669007587f35ed4a97d40097ca
- e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0"
conflicts="qt<4.8.7_12"
-
-if [ -n "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt-devel qt-designer-devel"
-fi
-
-# Use the same value for -std= as in qt
-CXXFLAGS="-std=gnu++98 -Wno-deprecated -fno-delete-null-pointer-checks -fno-lifetime-dse"
-
-post_extract() {
- patch -p1 < ${FILESDIR}/fix-gcc6.patch
- patch -p1 < ${FILESDIR}/fix-execinfo.patch
- patch -p1 < ${FILESDIR}/fix-mallinfo.patch
- patch -p0 < ${FILESDIR}/qwebview.patch
- mv qt-everywhere-opensource-src-${_qtver} ..
-}
-
-do_configure() {
- :
-}
-
-do_build() {
- local opts="--qt --prefix=/usr --no-webkit2 --release"
- case "$XBPS_TARGET_MACHINE" in
- i686*) # Do not force SSE2 for i686
- opts+=" --no-force-sse2"
- ;;
- aarch64*)
- # Disable JIT
- opts+=" DEFINES+=ENABLE_JIT=0"
- opts+=" DEFINES+=ENABLE_YARR_JIT=0"
- ;;
- arm*|mips*|ppc*)
- # Disable JIT and assembler
- opts+=" DEFINES+=ENABLE_JIT=0"
- opts+=" DEFINES+=ENABLE_YARR_JIT=0"
- opts+=" DEFINES+=ENABLE_ASSEMBLER=0"
- ;;
- esac
- if [ -n "$CROSS_BUILD" ]; then
- opts+=" --qmakearg=\"CONFIG+=production_build\""
- opts+=" --qmakearg=\"QMAKE_CC=$CC\""
- opts+=" --qmakearg=\"QMAKE_CXX=$CXX\""
- opts+=" --qmakearg=\"QMAKE_LINK=$CXX\""
- opts+=" --qmakearg=\"QMAKE_LINK_SHARED=$CXX\""
- opts+=" --qmakearg=\"QMAKE_AR=$AR cru\""
- opts+=" --qmakearg=\"QMAKE_OBJDUMP=$OBJDUMP\""
- opts+=" --qmakearg=\"QMAKE_CFLAGS='$CFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_CFLAGS_RELEASE='$CFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_CXXFLAGS='$CXXFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_CXXFLAGS_RELEASE='$CXXFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_LFLAGS='$LDFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_LFLAGS_RELEASE='$LDFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_INCDIR=${XBPS_CROSS_BASE}/usr/include\""
- opts+=" --qmakearg=\"QMAKE_INCDIR_QT=${XBPS_CROSS_BASE}/usr/include\""
- fi
- export QTDIR=/usr
- export PATH="/usr/lib/qt/bin:$PATH"
- find -name "Makefile*" -exec sed -i "{}" \
- -e"s;^\(CC[ ]*=\).*;\1 $CC;" \
- -e"s;^\(CXX[ ]*=\).*;\1 $CXX;" \
- -e"s;^\(LINK[ ]*=\).*;\1 $CXX;" \
- -e"s;^\(CFLAGS[ ]*=\)\(.*\);\1 \2 $CFLAGS;" \
- -e"s;^\(CXXFLAGS[ ]*=\)\(.*\);\1 \2 $CXXFLAGS;" \
- -e"s;^\(LFLAGS[ ]*=\)\(.*\);\1 \2 $LDFLAGS;" \
- \;
- Tools/Scripts/build-webkit --makeargs="${makejobs}" ${opts}
- cd ../qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview
- qmake QMAKE_CFLAGS="$CFLAGS" QMAKE_CXXFLAGS="$CXXFLAGS" QMAKE_LFLAGS="$LDFLAGS"
- make ${makejobs} CC="$CC" CXX="$CXX" LINK="$CXX"
-}
-
-do_install() {
- make INSTALL_ROOT="${DESTDIR}" -C WebKitBuild/Release install
- cd ../qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview
- make INSTALL_ROOT="${DESTDIR}" install
-
- # Remove references to the build directory from .prl and .pc files
- sed -i 's| -L.*/*/release||g' ${DESTDIR}/usr/lib/pkgconfig/QtWebKit.pc
- sed -i '/^QMAKE_PRL_BUILD_DIR/d' ${DESTDIR}/usr/lib/libQtWebKit.prl
-}
-
-qt-webkit-devel_package() {
- short_desc+=" - development files"
- depends="qt-devel ${sourcepkg}>=${version}_${revision}"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/*.so
- vmove usr/lib/*.prl
- vmove usr/lib/pkgconfig
- vmove usr/share/qt/mkspecs
- }
-}
+replaces="qt-webkit-devel>=0"
From 2fed8d28114802051a5be0627fc83f73d9ee187e Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Tue, 17 Sep 2019 14:48:33 +0200
Subject: [PATCH 2/4] phonon: remove
---
common/shlibs | 2 --
srcpkgs/phonon-devel | 1 -
srcpkgs/phonon/INSTALL.msg | 1 +
srcpkgs/phonon/template | 34 +++++-----------------------------
4 files changed, 6 insertions(+), 32 deletions(-)
delete mode 120000 srcpkgs/phonon-devel
create mode 100644 srcpkgs/phonon/INSTALL.msg
diff --git a/common/shlibs b/common/shlibs
index 58260aabca0..bc6b78029e9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1312,8 +1312,6 @@ libdb-5.3.so libdb-5.3.21_1
libdb_cxx-5.3.so libdb-cxx-5.3.21_1
libcares.so.2 c-ares-1.10.0_1
libcryptopp.so.5.6 crypto++-565_1
-libphonon.so.4 phonon-4.6.0_1
-libphononexperimental.so.4 phonon-4.6.0_1
libdbusmenu-glib.so.4 libdbusmenu-glib-12.10.2_1
libdbusmenu-gtk3.so.4 libdbusmenu-gtk3-12.10.2_1
libGrantlee_Templates.so.5 grantlee5-5.0.0_1
diff --git a/srcpkgs/phonon-devel b/srcpkgs/phonon-devel
deleted file mode 120000
index ce8c63abf05..00000000000
--- a/srcpkgs/phonon-devel
+++ /dev/null
@@ -1 +0,0 @@
-phonon
\ No newline at end of file
diff --git a/srcpkgs/phonon/INSTALL.msg b/srcpkgs/phonon/INSTALL.msg
new file mode 100644
index 00000000000..0b787f67a35
--- /dev/null
+++ b/srcpkgs/phonon/INSTALL.msg
@@ -0,0 +1 @@
+phonon is no longer provided by Void Linux, and will be fully removed from the repos on 2019-12-17
diff --git a/srcpkgs/phonon/template b/srcpkgs/phonon/template
index e48f009869d..5f642bdbad2 100644
--- a/srcpkgs/phonon/template
+++ b/srcpkgs/phonon/template
@@ -1,34 +1,10 @@
# Template file for 'phonon'
pkgname=phonon
version=4.9.1
-revision=2
-build_style=cmake
-configure_args="-Wno-dev -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE"
-hostmakedepends="pkg-config automoc4"
-makedepends="glib-devel qt-devel pulseaudio-devel"
-short_desc="Multimedia framework for KDE (Qt 4.x)"
+revision=3
+build_style=meta
+short_desc="Multimedia framework for KDE (Qt 4.x) (removed package)"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-or-later"
+license="BSD-2-Clause"
homepage="https://phonon.kde.org/"
-distfiles="${KDE_SITE}/${pkgname}/${version}/${pkgname}-${version}.tar.xz"
-checksum=67bee986f85ca8b575186c8ba58a85886cb3b1c3567c86a118d56129f221e69c
-
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt-devel"
-fi
-
-post_install() {
- # Create compat symlink for QT phonon.
- vmkdir usr/lib/qt/plugins
- ln -s /usr/lib/kde4/plugins/phonon_backend ${DESTDIR}/usr/lib/qt/plugins
-}
-
-phonon-devel_package() {
- depends="qt-devel ${sourcepkg}-${version}_${revision}"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/cmake
- vmove usr/lib/pkgconfig
- vmove usr/share/phonon
- }
-}
+replaces="phonon-devel>=0"
From f368a1d542d3169f644ba5fdcfc31d0662d28099 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Tue, 17 Sep 2019 14:57:21 +0200
Subject: [PATCH 3/4] luxmark: remove
---
srcpkgs/luxmark/INSTALL.msg | 1 +
srcpkgs/luxmark/template | 23 +++--------------------
srcpkgs/luxmark/update | 2 --
3 files changed, 4 insertions(+), 22 deletions(-)
create mode 100644 srcpkgs/luxmark/INSTALL.msg
delete mode 100644 srcpkgs/luxmark/update
diff --git a/srcpkgs/luxmark/INSTALL.msg b/srcpkgs/luxmark/INSTALL.msg
new file mode 100644
index 00000000000..70228207809
--- /dev/null
+++ b/srcpkgs/luxmark/INSTALL.msg
@@ -0,0 +1 @@
+luxmark is no longer provided by Void Linux, and will be fully removed from the repos on 2019-12-17
diff --git a/srcpkgs/luxmark/template b/srcpkgs/luxmark/template
index 588f76046fc..f2524539a36 100644
--- a/srcpkgs/luxmark/template
+++ b/srcpkgs/luxmark/template
@@ -1,26 +1,9 @@
# Template file for 'luxmark'
pkgname=luxmark
version=3.1
-revision=7
-build_style=cmake
-makedepends="openimageio-devel tiff-devel libpng-devel libgomp-devel
- libopenexr-devel MesaLib-devel ocl-icd-devel opencl-headers boost-devel
- python-devel luxrays-devel glew-devel libfreeglut-devel qt-devel opencl-clhpp"
-short_desc="OpenCL benchmark based on LuxCore"
+revision=8
+build_style=meta
+short_desc="OpenCL benchmark based on LuxCore (removed package)"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3"
homepage="http://www.luxrender.net/wiki/LuxMark"
-distfiles="https://bitbucket.org/luxrender/luxmark/get/${pkgname}_v${version}.tar.gz"
-checksum=175cc38f8a3cb73cf2ef25d6e99981456d66e1f9c7fb362522e7e58319c026e6
-
-configure_args=" -DCMAKE_SKIP_RPATH=ON"
-
-post_extract() {
- mv $XBPS_BUILDDIR/luxrender-luxmark* $wrksrc
-}
-
-do_install() {
- vbin build/bin/luxmark
- vmkdir usr/share/luxmark
- vcopy scenes usr/share/luxmark
-}
diff --git a/srcpkgs/luxmark/update b/srcpkgs/luxmark/update
deleted file mode 100644
index 24c7a3b659e..00000000000
--- a/srcpkgs/luxmark/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://bitbucket.org/api/1.0/repositories/luxrender/luxmark/tags"
-pattern='luxmark_v\K([\d.]+)(?=")'
From b5099c7c345baba3999f13b496b964bf0ff3ada6 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Tue, 17 Sep 2019 14:59:48 +0200
Subject: [PATCH 4/4] qucs: remove
---
srcpkgs/qucs/INSTALL.msg | 1 +
srcpkgs/qucs/template | 12 +++---------
2 files changed, 4 insertions(+), 9 deletions(-)
create mode 100644 srcpkgs/qucs/INSTALL.msg
diff --git a/srcpkgs/qucs/INSTALL.msg b/srcpkgs/qucs/INSTALL.msg
new file mode 100644
index 00000000000..b35fd8aa61a
--- /dev/null
+++ b/srcpkgs/qucs/INSTALL.msg
@@ -0,0 +1 @@
+qucs is no longer provided by Void Linux, and will be fully removed from the repos on 2019-12-17
diff --git a/srcpkgs/qucs/template b/srcpkgs/qucs/template
index 4c18a3258c3..0eb22b505b9 100644
--- a/srcpkgs/qucs/template
+++ b/srcpkgs/qucs/template
@@ -1,15 +1,9 @@
# Template file for 'qucs'
pkgname=qucs
version=0.0.19
-revision=2
-build_style=gnu-configure
-configure_args="--disable-doc"
-hostmakedepends="ADMS-qucs gperf qt-devel"
-makedepends="qt-devel"
-short_desc="Quite Universal Circuit Simulator"
+revision=3
+build_style=meta
+short_desc="Quite Universal Circuit Simulator (removed package)"
maintainer="Martijn van Buul <martijn.van.buul@gmail.com>"
license="GPL-2"
homepage="http://qucs.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${version}/${pkgname}-${version}.tar.gz"
-checksum="45c6434fde24c533e63550675ac21cdbd3cc6cbba29b82a1dc3f36e7dd4b3b3e"
-nocross="yes" # seems to compile all the way, but seems to link against the wrong libX11 (at least)
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] qt: remove
2019-09-17 12:40 [PR PATCH] qt-webkit: remove voidlinux-github
` (3 preceding siblings ...)
2019-09-17 12:44 ` voidlinux-github
@ 2019-09-17 12:59 ` voidlinux-github
2019-09-17 12:59 ` voidlinux-github
` (5 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: voidlinux-github @ 2019-09-17 12:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 427 bytes --]
There is an updated pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages qt-webkit
https://github.com/void-linux/void-packages/pull/14520
[WIP] qt: remove
there are also a few python*-PyQt4-* packages in the binary repos that have to be removed.
And python3-pyside*
A patch file from https://github.com/void-linux/void-packages/pull/14520.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt-webkit-14520.patch --]
[-- Type: text/x-diff, Size: 18523 bytes --]
From 3ae3b4f5b6a5b4fbf7ade15c7176e02f110714c3 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Tue, 17 Sep 2019 14:33:08 +0200
Subject: [PATCH 1/4] qt-webkit: remove
---
common/shlibs | 1 -
srcpkgs/qt-webkit-devel | 1 -
srcpkgs/qt-webkit/INSTALL.msg | 1 +
srcpkgs/qt-webkit/files/fix-execinfo.patch | 20 ----
srcpkgs/qt-webkit/files/fix-gcc6.patch | 14 ---
srcpkgs/qt-webkit/files/fix-mallinfo.patch | 11 --
.../files/fix-saturated_arithmetic.patch | 20 ----
srcpkgs/qt-webkit/files/qwebview.patch | 21 ----
srcpkgs/qt-webkit/template | 112 +-----------------
9 files changed, 6 insertions(+), 195 deletions(-)
delete mode 120000 srcpkgs/qt-webkit-devel
create mode 100644 srcpkgs/qt-webkit/INSTALL.msg
delete mode 100644 srcpkgs/qt-webkit/files/fix-execinfo.patch
delete mode 100644 srcpkgs/qt-webkit/files/fix-gcc6.patch
delete mode 100644 srcpkgs/qt-webkit/files/fix-mallinfo.patch
delete mode 100644 srcpkgs/qt-webkit/files/fix-saturated_arithmetic.patch
delete mode 100644 srcpkgs/qt-webkit/files/qwebview.patch
diff --git a/common/shlibs b/common/shlibs
index d15941dce29..58260aabca0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -456,7 +456,6 @@ libQtSql.so.4 qt-4.5.3_1
libQtDeclarative.so.4 qt-4.5.3_1
libQtDesignerComponents.so.4 qt-designer-libs-4.7.8_13
libQtDesigner.so.4 qt-designer-libs-4.7.8_13
-libQtWebKit.so.4 qt-webkit-2.3.4_1
libsysfs.so.2 libsysfs-2.1.0_1
libsensors.so.5 libsensors-3.5.0_1
libcap-ng.so.0 libcap-ng-0.6.2_1
diff --git a/srcpkgs/qt-webkit-devel b/srcpkgs/qt-webkit-devel
deleted file mode 120000
index f3c82c42591..00000000000
--- a/srcpkgs/qt-webkit-devel
+++ /dev/null
@@ -1 +0,0 @@
-qt-webkit
\ No newline at end of file
diff --git a/srcpkgs/qt-webkit/INSTALL.msg b/srcpkgs/qt-webkit/INSTALL.msg
new file mode 100644
index 00000000000..07765985647
--- /dev/null
+++ b/srcpkgs/qt-webkit/INSTALL.msg
@@ -0,0 +1 @@
+qt-webkit is no longer provided by Void Linux, and will be fully removed from the repos on 2019-12-17
diff --git a/srcpkgs/qt-webkit/files/fix-execinfo.patch b/srcpkgs/qt-webkit/files/fix-execinfo.patch
deleted file mode 100644
index 93a4dec73fa..00000000000
--- a/srcpkgs/qt-webkit/files/fix-execinfo.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- qtwebkit-2.3.4/Source/WTF/wtf/Assertions.cpp 2014-09-24 13:42:05.000000000 +0200
-+++ qtwebkit-2.3.4/Source/WTF/wtf/Assertions.cpp 2016-09-17 23:37:12.846758706 +0200
-@@ -58,7 +58,7 @@
- #include <windows.h>
- #endif
-
--#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
-+#if (OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__))) && !OS(ANDROID)
- #include <cxxabi.h>
- #include <dlfcn.h>
- #include <execinfo.h>
-@@ -242,7 +242,7 @@
-
- void WTFGetBacktrace(void** stack, int* size)
- {
--#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
-+#if (OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__))) && !OS(ANDROID)
- *size = backtrace(stack, *size);
- #elif OS(WINDOWS) && !OS(WINCE)
- // The CaptureStackBackTrace function is available in XP, but it is not defined
diff --git a/srcpkgs/qt-webkit/files/fix-gcc6.patch b/srcpkgs/qt-webkit/files/fix-gcc6.patch
deleted file mode 100644
index 6e6215c7e25..00000000000
--- a/srcpkgs/qt-webkit/files/fix-gcc6.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- webkit-qtwebkit-23/Source/JavaScriptCore/runtime/JSObject.cpp.gcc5 2014-09-24 06:42:05.000000000 -0500
-+++ webkit-qtwebkit-23/Source/JavaScriptCore/runtime/JSObject.cpp 2015-03-20 08:15:53.192778375 -0500
-@@ -1922,6 +1922,10 @@ void JSObject::putByIndexBeyondVectorLen
- }
- }
-
-+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<ContiguousShape>(ExecState* exec, unsigned i, JSValue value);
-+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<DoubleShape>(ExecState* exec, unsigned i, JSValue value);
-+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<Int32Shape>(ExecState* exec, unsigned i, JSValue value);
-+
- void JSObject::putByIndexBeyondVectorLengthWithArrayStorage(ExecState* exec, unsigned i, JSValue value, bool shouldThrow, ArrayStorage* storage)
- {
- JSGlobalData& globalData = exec->globalData();
-
diff --git a/srcpkgs/qt-webkit/files/fix-mallinfo.patch b/srcpkgs/qt-webkit/files/fix-mallinfo.patch
deleted file mode 100644
index 60c5d085fe0..00000000000
--- a/srcpkgs/qt-webkit/files/fix-mallinfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qtwebkit-2.3.4/Source/WebCore/platform/qt/MemoryUsageSupportQt.cpp 2014-09-24 13:42:05.000000000 +0200
-+++ qtwebkit-2.3.4/Source/WebCore/platform/qt/MemoryUsageSupportQt.cpp 2016-09-17 23:48:23.558775636 +0200
-@@ -31,7 +31,7 @@
-
- namespace WebCore {
-
--#if OS(LINUX)
-+#if OS(LINUX) && defined(__GLIBC__)
- static size_t mallocMemoryUsage(bool inuse)
- {
- // Return how much memory (in bytes) has been allocated on the system heap.
diff --git a/srcpkgs/qt-webkit/files/fix-saturated_arithmetic.patch b/srcpkgs/qt-webkit/files/fix-saturated_arithmetic.patch
deleted file mode 100644
index f9a18220a99..00000000000
--- a/srcpkgs/qt-webkit/files/fix-saturated_arithmetic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- qtwebkit-2.3.4/Source/WTF/wtf/SaturatedArithmetic.h 2014-09-24 13:42:05.000000000 +0200
-+++ qtwebkit-2.3.4/Source/WTF/wtf/SaturatedArithmetic.h 2017-02-19 16:27:58.343676787 +0100
-@@ -43,7 +43,7 @@
-
- // Can only overflow if the signed bit of the two values match. If the signed
- // bit of the result and one of the values differ it did overflow.
-- if (!((ua ^ ub) >> 31) & (result ^ ua) >> 31)
-+ if (~((ua ^ ub) >> 31) & ((result ^ ua) >> 31))
- result = std::numeric_limits<int>::max() + (ua >> 31);
-
- return result;
-@@ -57,7 +57,7 @@
-
- // Can only overflow if the signed bit of the two values do not match. If the
- // signed bit of the result and the first value differ it did overflow.
-- if ((ua ^ ub) >> 31 & (result ^ ua) >> 31)
-+ if (((ua ^ ub) >> 31) & ((result ^ ua) >> 31))
- result = std::numeric_limits<int>::max() + (ua >> 31);
-
- return result;
diff --git a/srcpkgs/qt-webkit/files/qwebview.patch b/srcpkgs/qt-webkit/files/qwebview.patch
deleted file mode 100644
index f8aa8c3101b..00000000000
--- a/srcpkgs/qt-webkit/files/qwebview.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- qt-everywhere-opensource-src-4.8.7/tools/designer/src/plugins/plugins.pri~ 2013-01-09 12:56:08.915412090 +0000
-+++ qt-everywhere-opensource-src-4.8.7/tools/designer/src/plugins/plugins.pri 2013-01-09 12:58:06.911391299 +0000
-@@ -1,3 +1,6 @@
-+INCLUDEPATH += ../../../../../../qtwebkit-2.3.4/WebKitBuild/Release/include
-+LIBS += -L../../../../../../qtwebkit-2.3.4/WebKitBuild/Release/lib
-+
- CONFIG += designer
- win32|mac: CONFIG+= debug_and_release
- QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/designer
---- qt-everywhere-opensource-src-4.8.7/tools/designer/src/plugins/plugins.pro~ 2013-01-09 12:55:43.598892405 +0000
-+++ qt-everywhere-opensource-src-4.8.7/tools/designer/src/plugins/plugins.pro 2013-01-09 12:55:53.352169136 +0000
-@@ -2,9 +2,4 @@
- CONFIG += ordered
-
- REQUIRES = !CONFIG(static,shared|static)
--contains(QT_CONFIG, qt3support): SUBDIRS += widgets
--win32: SUBDIRS += activeqt
--# contains(QT_CONFIG, opengl): SUBDIRS += tools/view3d
- contains(QT_CONFIG, webkit): SUBDIRS += qwebview
--contains(QT_CONFIG, phonon): SUBDIRS += phononwidgets
--contains(QT_CONFIG, declarative): SUBDIRS += qdeclarativeview
diff --git a/srcpkgs/qt-webkit/template b/srcpkgs/qt-webkit/template
index 1c3ff6c0ee2..ecaa15fcd16 100644
--- a/srcpkgs/qt-webkit/template
+++ b/srcpkgs/qt-webkit/template
@@ -1,113 +1,11 @@
# Template file for 'qt-webkit'
pkgname=qt-webkit
version=2.3.4
-revision=7
-_qtver=4.8.7
-wrksrc="qtwebkit-${version}"
-create_wrksrc=yes
-hostmakedepends="automake libtool bison flex gperf python ruby pkg-config qt-qmake"
-makedepends="MesaLib-devel libjpeg-turbo-devel qt-devel qt-designer-devel
- glib-devel fontconfig-devel gst-plugins-base1-devel sqlite-devel libXrender-devel"
-short_desc="Open source web browser engine (Qt4 port)"
+revision=8
+build_style=meta
+short_desc="Open source web browser engine (Qt4 port) (removed package)"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="LGPL-2.1, GPL-3"
+license="BSD-2-Clause"
homepage="http://trac.webkit.org/wiki/QtWebKit"
-distfiles="
- http://download.kde.org/stable/qtwebkit-${version%.*}/${version}/src/qtwebkit-${version}.tar.gz
- http://download.qt.io/official_releases/qt/${_qtver%.*}/${_qtver}/qt-everywhere-opensource-src-${_qtver}.tar.gz"
-checksum="
- c6cfa9d068f7eb024fee3f6c24f5b8b726997f669007587f35ed4a97d40097ca
- e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0"
conflicts="qt<4.8.7_12"
-
-if [ -n "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt-devel qt-designer-devel"
-fi
-
-# Use the same value for -std= as in qt
-CXXFLAGS="-std=gnu++98 -Wno-deprecated -fno-delete-null-pointer-checks -fno-lifetime-dse"
-
-post_extract() {
- patch -p1 < ${FILESDIR}/fix-gcc6.patch
- patch -p1 < ${FILESDIR}/fix-execinfo.patch
- patch -p1 < ${FILESDIR}/fix-mallinfo.patch
- patch -p0 < ${FILESDIR}/qwebview.patch
- mv qt-everywhere-opensource-src-${_qtver} ..
-}
-
-do_configure() {
- :
-}
-
-do_build() {
- local opts="--qt --prefix=/usr --no-webkit2 --release"
- case "$XBPS_TARGET_MACHINE" in
- i686*) # Do not force SSE2 for i686
- opts+=" --no-force-sse2"
- ;;
- aarch64*)
- # Disable JIT
- opts+=" DEFINES+=ENABLE_JIT=0"
- opts+=" DEFINES+=ENABLE_YARR_JIT=0"
- ;;
- arm*|mips*|ppc*)
- # Disable JIT and assembler
- opts+=" DEFINES+=ENABLE_JIT=0"
- opts+=" DEFINES+=ENABLE_YARR_JIT=0"
- opts+=" DEFINES+=ENABLE_ASSEMBLER=0"
- ;;
- esac
- if [ -n "$CROSS_BUILD" ]; then
- opts+=" --qmakearg=\"CONFIG+=production_build\""
- opts+=" --qmakearg=\"QMAKE_CC=$CC\""
- opts+=" --qmakearg=\"QMAKE_CXX=$CXX\""
- opts+=" --qmakearg=\"QMAKE_LINK=$CXX\""
- opts+=" --qmakearg=\"QMAKE_LINK_SHARED=$CXX\""
- opts+=" --qmakearg=\"QMAKE_AR=$AR cru\""
- opts+=" --qmakearg=\"QMAKE_OBJDUMP=$OBJDUMP\""
- opts+=" --qmakearg=\"QMAKE_CFLAGS='$CFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_CFLAGS_RELEASE='$CFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_CXXFLAGS='$CXXFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_CXXFLAGS_RELEASE='$CXXFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_LFLAGS='$LDFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_LFLAGS_RELEASE='$LDFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_INCDIR=${XBPS_CROSS_BASE}/usr/include\""
- opts+=" --qmakearg=\"QMAKE_INCDIR_QT=${XBPS_CROSS_BASE}/usr/include\""
- fi
- export QTDIR=/usr
- export PATH="/usr/lib/qt/bin:$PATH"
- find -name "Makefile*" -exec sed -i "{}" \
- -e"s;^\(CC[ ]*=\).*;\1 $CC;" \
- -e"s;^\(CXX[ ]*=\).*;\1 $CXX;" \
- -e"s;^\(LINK[ ]*=\).*;\1 $CXX;" \
- -e"s;^\(CFLAGS[ ]*=\)\(.*\);\1 \2 $CFLAGS;" \
- -e"s;^\(CXXFLAGS[ ]*=\)\(.*\);\1 \2 $CXXFLAGS;" \
- -e"s;^\(LFLAGS[ ]*=\)\(.*\);\1 \2 $LDFLAGS;" \
- \;
- Tools/Scripts/build-webkit --makeargs="${makejobs}" ${opts}
- cd ../qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview
- qmake QMAKE_CFLAGS="$CFLAGS" QMAKE_CXXFLAGS="$CXXFLAGS" QMAKE_LFLAGS="$LDFLAGS"
- make ${makejobs} CC="$CC" CXX="$CXX" LINK="$CXX"
-}
-
-do_install() {
- make INSTALL_ROOT="${DESTDIR}" -C WebKitBuild/Release install
- cd ../qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview
- make INSTALL_ROOT="${DESTDIR}" install
-
- # Remove references to the build directory from .prl and .pc files
- sed -i 's| -L.*/*/release||g' ${DESTDIR}/usr/lib/pkgconfig/QtWebKit.pc
- sed -i '/^QMAKE_PRL_BUILD_DIR/d' ${DESTDIR}/usr/lib/libQtWebKit.prl
-}
-
-qt-webkit-devel_package() {
- short_desc+=" - development files"
- depends="qt-devel ${sourcepkg}>=${version}_${revision}"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/*.so
- vmove usr/lib/*.prl
- vmove usr/lib/pkgconfig
- vmove usr/share/qt/mkspecs
- }
-}
+replaces="qt-webkit-devel>=0"
From 2fed8d28114802051a5be0627fc83f73d9ee187e Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Tue, 17 Sep 2019 14:48:33 +0200
Subject: [PATCH 2/4] phonon: remove
---
common/shlibs | 2 --
srcpkgs/phonon-devel | 1 -
srcpkgs/phonon/INSTALL.msg | 1 +
srcpkgs/phonon/template | 34 +++++-----------------------------
4 files changed, 6 insertions(+), 32 deletions(-)
delete mode 120000 srcpkgs/phonon-devel
create mode 100644 srcpkgs/phonon/INSTALL.msg
diff --git a/common/shlibs b/common/shlibs
index 58260aabca0..bc6b78029e9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1312,8 +1312,6 @@ libdb-5.3.so libdb-5.3.21_1
libdb_cxx-5.3.so libdb-cxx-5.3.21_1
libcares.so.2 c-ares-1.10.0_1
libcryptopp.so.5.6 crypto++-565_1
-libphonon.so.4 phonon-4.6.0_1
-libphononexperimental.so.4 phonon-4.6.0_1
libdbusmenu-glib.so.4 libdbusmenu-glib-12.10.2_1
libdbusmenu-gtk3.so.4 libdbusmenu-gtk3-12.10.2_1
libGrantlee_Templates.so.5 grantlee5-5.0.0_1
diff --git a/srcpkgs/phonon-devel b/srcpkgs/phonon-devel
deleted file mode 120000
index ce8c63abf05..00000000000
--- a/srcpkgs/phonon-devel
+++ /dev/null
@@ -1 +0,0 @@
-phonon
\ No newline at end of file
diff --git a/srcpkgs/phonon/INSTALL.msg b/srcpkgs/phonon/INSTALL.msg
new file mode 100644
index 00000000000..0b787f67a35
--- /dev/null
+++ b/srcpkgs/phonon/INSTALL.msg
@@ -0,0 +1 @@
+phonon is no longer provided by Void Linux, and will be fully removed from the repos on 2019-12-17
diff --git a/srcpkgs/phonon/template b/srcpkgs/phonon/template
index e48f009869d..5f642bdbad2 100644
--- a/srcpkgs/phonon/template
+++ b/srcpkgs/phonon/template
@@ -1,34 +1,10 @@
# Template file for 'phonon'
pkgname=phonon
version=4.9.1
-revision=2
-build_style=cmake
-configure_args="-Wno-dev -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE"
-hostmakedepends="pkg-config automoc4"
-makedepends="glib-devel qt-devel pulseaudio-devel"
-short_desc="Multimedia framework for KDE (Qt 4.x)"
+revision=3
+build_style=meta
+short_desc="Multimedia framework for KDE (Qt 4.x) (removed package)"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-or-later"
+license="BSD-2-Clause"
homepage="https://phonon.kde.org/"
-distfiles="${KDE_SITE}/${pkgname}/${version}/${pkgname}-${version}.tar.xz"
-checksum=67bee986f85ca8b575186c8ba58a85886cb3b1c3567c86a118d56129f221e69c
-
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt-devel"
-fi
-
-post_install() {
- # Create compat symlink for QT phonon.
- vmkdir usr/lib/qt/plugins
- ln -s /usr/lib/kde4/plugins/phonon_backend ${DESTDIR}/usr/lib/qt/plugins
-}
-
-phonon-devel_package() {
- depends="qt-devel ${sourcepkg}-${version}_${revision}"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/cmake
- vmove usr/lib/pkgconfig
- vmove usr/share/phonon
- }
-}
+replaces="phonon-devel>=0"
From f368a1d542d3169f644ba5fdcfc31d0662d28099 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Tue, 17 Sep 2019 14:57:21 +0200
Subject: [PATCH 3/4] luxmark: remove
---
srcpkgs/luxmark/INSTALL.msg | 1 +
srcpkgs/luxmark/template | 23 +++--------------------
srcpkgs/luxmark/update | 2 --
3 files changed, 4 insertions(+), 22 deletions(-)
create mode 100644 srcpkgs/luxmark/INSTALL.msg
delete mode 100644 srcpkgs/luxmark/update
diff --git a/srcpkgs/luxmark/INSTALL.msg b/srcpkgs/luxmark/INSTALL.msg
new file mode 100644
index 00000000000..70228207809
--- /dev/null
+++ b/srcpkgs/luxmark/INSTALL.msg
@@ -0,0 +1 @@
+luxmark is no longer provided by Void Linux, and will be fully removed from the repos on 2019-12-17
diff --git a/srcpkgs/luxmark/template b/srcpkgs/luxmark/template
index 588f76046fc..f2524539a36 100644
--- a/srcpkgs/luxmark/template
+++ b/srcpkgs/luxmark/template
@@ -1,26 +1,9 @@
# Template file for 'luxmark'
pkgname=luxmark
version=3.1
-revision=7
-build_style=cmake
-makedepends="openimageio-devel tiff-devel libpng-devel libgomp-devel
- libopenexr-devel MesaLib-devel ocl-icd-devel opencl-headers boost-devel
- python-devel luxrays-devel glew-devel libfreeglut-devel qt-devel opencl-clhpp"
-short_desc="OpenCL benchmark based on LuxCore"
+revision=8
+build_style=meta
+short_desc="OpenCL benchmark based on LuxCore (removed package)"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3"
homepage="http://www.luxrender.net/wiki/LuxMark"
-distfiles="https://bitbucket.org/luxrender/luxmark/get/${pkgname}_v${version}.tar.gz"
-checksum=175cc38f8a3cb73cf2ef25d6e99981456d66e1f9c7fb362522e7e58319c026e6
-
-configure_args=" -DCMAKE_SKIP_RPATH=ON"
-
-post_extract() {
- mv $XBPS_BUILDDIR/luxrender-luxmark* $wrksrc
-}
-
-do_install() {
- vbin build/bin/luxmark
- vmkdir usr/share/luxmark
- vcopy scenes usr/share/luxmark
-}
diff --git a/srcpkgs/luxmark/update b/srcpkgs/luxmark/update
deleted file mode 100644
index 24c7a3b659e..00000000000
--- a/srcpkgs/luxmark/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://bitbucket.org/api/1.0/repositories/luxrender/luxmark/tags"
-pattern='luxmark_v\K([\d.]+)(?=")'
From b5099c7c345baba3999f13b496b964bf0ff3ada6 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Tue, 17 Sep 2019 14:59:48 +0200
Subject: [PATCH 4/4] qucs: remove
---
srcpkgs/qucs/INSTALL.msg | 1 +
srcpkgs/qucs/template | 12 +++---------
2 files changed, 4 insertions(+), 9 deletions(-)
create mode 100644 srcpkgs/qucs/INSTALL.msg
diff --git a/srcpkgs/qucs/INSTALL.msg b/srcpkgs/qucs/INSTALL.msg
new file mode 100644
index 00000000000..b35fd8aa61a
--- /dev/null
+++ b/srcpkgs/qucs/INSTALL.msg
@@ -0,0 +1 @@
+qucs is no longer provided by Void Linux, and will be fully removed from the repos on 2019-12-17
diff --git a/srcpkgs/qucs/template b/srcpkgs/qucs/template
index 4c18a3258c3..0eb22b505b9 100644
--- a/srcpkgs/qucs/template
+++ b/srcpkgs/qucs/template
@@ -1,15 +1,9 @@
# Template file for 'qucs'
pkgname=qucs
version=0.0.19
-revision=2
-build_style=gnu-configure
-configure_args="--disable-doc"
-hostmakedepends="ADMS-qucs gperf qt-devel"
-makedepends="qt-devel"
-short_desc="Quite Universal Circuit Simulator"
+revision=3
+build_style=meta
+short_desc="Quite Universal Circuit Simulator (removed package)"
maintainer="Martijn van Buul <martijn.van.buul@gmail.com>"
license="GPL-2"
homepage="http://qucs.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${version}/${pkgname}-${version}.tar.gz"
-checksum="45c6434fde24c533e63550675ac21cdbd3cc6cbba29b82a1dc3f36e7dd4b3b3e"
-nocross="yes" # seems to compile all the way, but seems to link against the wrong libX11 (at least)
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] qt: remove
2019-09-17 12:40 [PR PATCH] qt-webkit: remove voidlinux-github
` (5 preceding siblings ...)
2019-09-17 12:59 ` voidlinux-github
@ 2019-09-17 13:11 ` voidlinux-github
2019-09-17 13:11 ` voidlinux-github
` (3 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: voidlinux-github @ 2019-09-17 13:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 427 bytes --]
There is an updated pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages qt-webkit
https://github.com/void-linux/void-packages/pull/14520
[WIP] qt: remove
there are also a few python*-PyQt4-* packages in the binary repos that have to be removed.
And python3-pyside*
A patch file from https://github.com/void-linux/void-packages/pull/14520.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt-webkit-14520.patch --]
[-- Type: text/x-diff, Size: 24196 bytes --]
From 3ae3b4f5b6a5b4fbf7ade15c7176e02f110714c3 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Tue, 17 Sep 2019 14:33:08 +0200
Subject: [PATCH 1/6] qt-webkit: remove
---
common/shlibs | 1 -
srcpkgs/qt-webkit-devel | 1 -
srcpkgs/qt-webkit/INSTALL.msg | 1 +
srcpkgs/qt-webkit/files/fix-execinfo.patch | 20 ----
srcpkgs/qt-webkit/files/fix-gcc6.patch | 14 ---
srcpkgs/qt-webkit/files/fix-mallinfo.patch | 11 --
.../files/fix-saturated_arithmetic.patch | 20 ----
srcpkgs/qt-webkit/files/qwebview.patch | 21 ----
srcpkgs/qt-webkit/template | 112 +-----------------
9 files changed, 6 insertions(+), 195 deletions(-)
delete mode 120000 srcpkgs/qt-webkit-devel
create mode 100644 srcpkgs/qt-webkit/INSTALL.msg
delete mode 100644 srcpkgs/qt-webkit/files/fix-execinfo.patch
delete mode 100644 srcpkgs/qt-webkit/files/fix-gcc6.patch
delete mode 100644 srcpkgs/qt-webkit/files/fix-mallinfo.patch
delete mode 100644 srcpkgs/qt-webkit/files/fix-saturated_arithmetic.patch
delete mode 100644 srcpkgs/qt-webkit/files/qwebview.patch
diff --git a/common/shlibs b/common/shlibs
index d15941dce29..58260aabca0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -456,7 +456,6 @@ libQtSql.so.4 qt-4.5.3_1
libQtDeclarative.so.4 qt-4.5.3_1
libQtDesignerComponents.so.4 qt-designer-libs-4.7.8_13
libQtDesigner.so.4 qt-designer-libs-4.7.8_13
-libQtWebKit.so.4 qt-webkit-2.3.4_1
libsysfs.so.2 libsysfs-2.1.0_1
libsensors.so.5 libsensors-3.5.0_1
libcap-ng.so.0 libcap-ng-0.6.2_1
diff --git a/srcpkgs/qt-webkit-devel b/srcpkgs/qt-webkit-devel
deleted file mode 120000
index f3c82c42591..00000000000
--- a/srcpkgs/qt-webkit-devel
+++ /dev/null
@@ -1 +0,0 @@
-qt-webkit
\ No newline at end of file
diff --git a/srcpkgs/qt-webkit/INSTALL.msg b/srcpkgs/qt-webkit/INSTALL.msg
new file mode 100644
index 00000000000..07765985647
--- /dev/null
+++ b/srcpkgs/qt-webkit/INSTALL.msg
@@ -0,0 +1 @@
+qt-webkit is no longer provided by Void Linux, and will be fully removed from the repos on 2019-12-17
diff --git a/srcpkgs/qt-webkit/files/fix-execinfo.patch b/srcpkgs/qt-webkit/files/fix-execinfo.patch
deleted file mode 100644
index 93a4dec73fa..00000000000
--- a/srcpkgs/qt-webkit/files/fix-execinfo.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- qtwebkit-2.3.4/Source/WTF/wtf/Assertions.cpp 2014-09-24 13:42:05.000000000 +0200
-+++ qtwebkit-2.3.4/Source/WTF/wtf/Assertions.cpp 2016-09-17 23:37:12.846758706 +0200
-@@ -58,7 +58,7 @@
- #include <windows.h>
- #endif
-
--#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
-+#if (OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__))) && !OS(ANDROID)
- #include <cxxabi.h>
- #include <dlfcn.h>
- #include <execinfo.h>
-@@ -242,7 +242,7 @@
-
- void WTFGetBacktrace(void** stack, int* size)
- {
--#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
-+#if (OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__))) && !OS(ANDROID)
- *size = backtrace(stack, *size);
- #elif OS(WINDOWS) && !OS(WINCE)
- // The CaptureStackBackTrace function is available in XP, but it is not defined
diff --git a/srcpkgs/qt-webkit/files/fix-gcc6.patch b/srcpkgs/qt-webkit/files/fix-gcc6.patch
deleted file mode 100644
index 6e6215c7e25..00000000000
--- a/srcpkgs/qt-webkit/files/fix-gcc6.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- webkit-qtwebkit-23/Source/JavaScriptCore/runtime/JSObject.cpp.gcc5 2014-09-24 06:42:05.000000000 -0500
-+++ webkit-qtwebkit-23/Source/JavaScriptCore/runtime/JSObject.cpp 2015-03-20 08:15:53.192778375 -0500
-@@ -1922,6 +1922,10 @@ void JSObject::putByIndexBeyondVectorLen
- }
- }
-
-+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<ContiguousShape>(ExecState* exec, unsigned i, JSValue value);
-+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<DoubleShape>(ExecState* exec, unsigned i, JSValue value);
-+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<Int32Shape>(ExecState* exec, unsigned i, JSValue value);
-+
- void JSObject::putByIndexBeyondVectorLengthWithArrayStorage(ExecState* exec, unsigned i, JSValue value, bool shouldThrow, ArrayStorage* storage)
- {
- JSGlobalData& globalData = exec->globalData();
-
diff --git a/srcpkgs/qt-webkit/files/fix-mallinfo.patch b/srcpkgs/qt-webkit/files/fix-mallinfo.patch
deleted file mode 100644
index 60c5d085fe0..00000000000
--- a/srcpkgs/qt-webkit/files/fix-mallinfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qtwebkit-2.3.4/Source/WebCore/platform/qt/MemoryUsageSupportQt.cpp 2014-09-24 13:42:05.000000000 +0200
-+++ qtwebkit-2.3.4/Source/WebCore/platform/qt/MemoryUsageSupportQt.cpp 2016-09-17 23:48:23.558775636 +0200
-@@ -31,7 +31,7 @@
-
- namespace WebCore {
-
--#if OS(LINUX)
-+#if OS(LINUX) && defined(__GLIBC__)
- static size_t mallocMemoryUsage(bool inuse)
- {
- // Return how much memory (in bytes) has been allocated on the system heap.
diff --git a/srcpkgs/qt-webkit/files/fix-saturated_arithmetic.patch b/srcpkgs/qt-webkit/files/fix-saturated_arithmetic.patch
deleted file mode 100644
index f9a18220a99..00000000000
--- a/srcpkgs/qt-webkit/files/fix-saturated_arithmetic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- qtwebkit-2.3.4/Source/WTF/wtf/SaturatedArithmetic.h 2014-09-24 13:42:05.000000000 +0200
-+++ qtwebkit-2.3.4/Source/WTF/wtf/SaturatedArithmetic.h 2017-02-19 16:27:58.343676787 +0100
-@@ -43,7 +43,7 @@
-
- // Can only overflow if the signed bit of the two values match. If the signed
- // bit of the result and one of the values differ it did overflow.
-- if (!((ua ^ ub) >> 31) & (result ^ ua) >> 31)
-+ if (~((ua ^ ub) >> 31) & ((result ^ ua) >> 31))
- result = std::numeric_limits<int>::max() + (ua >> 31);
-
- return result;
-@@ -57,7 +57,7 @@
-
- // Can only overflow if the signed bit of the two values do not match. If the
- // signed bit of the result and the first value differ it did overflow.
-- if ((ua ^ ub) >> 31 & (result ^ ua) >> 31)
-+ if (((ua ^ ub) >> 31) & ((result ^ ua) >> 31))
- result = std::numeric_limits<int>::max() + (ua >> 31);
-
- return result;
diff --git a/srcpkgs/qt-webkit/files/qwebview.patch b/srcpkgs/qt-webkit/files/qwebview.patch
deleted file mode 100644
index f8aa8c3101b..00000000000
--- a/srcpkgs/qt-webkit/files/qwebview.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- qt-everywhere-opensource-src-4.8.7/tools/designer/src/plugins/plugins.pri~ 2013-01-09 12:56:08.915412090 +0000
-+++ qt-everywhere-opensource-src-4.8.7/tools/designer/src/plugins/plugins.pri 2013-01-09 12:58:06.911391299 +0000
-@@ -1,3 +1,6 @@
-+INCLUDEPATH += ../../../../../../qtwebkit-2.3.4/WebKitBuild/Release/include
-+LIBS += -L../../../../../../qtwebkit-2.3.4/WebKitBuild/Release/lib
-+
- CONFIG += designer
- win32|mac: CONFIG+= debug_and_release
- QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/designer
---- qt-everywhere-opensource-src-4.8.7/tools/designer/src/plugins/plugins.pro~ 2013-01-09 12:55:43.598892405 +0000
-+++ qt-everywhere-opensource-src-4.8.7/tools/designer/src/plugins/plugins.pro 2013-01-09 12:55:53.352169136 +0000
-@@ -2,9 +2,4 @@
- CONFIG += ordered
-
- REQUIRES = !CONFIG(static,shared|static)
--contains(QT_CONFIG, qt3support): SUBDIRS += widgets
--win32: SUBDIRS += activeqt
--# contains(QT_CONFIG, opengl): SUBDIRS += tools/view3d
- contains(QT_CONFIG, webkit): SUBDIRS += qwebview
--contains(QT_CONFIG, phonon): SUBDIRS += phononwidgets
--contains(QT_CONFIG, declarative): SUBDIRS += qdeclarativeview
diff --git a/srcpkgs/qt-webkit/template b/srcpkgs/qt-webkit/template
index 1c3ff6c0ee2..ecaa15fcd16 100644
--- a/srcpkgs/qt-webkit/template
+++ b/srcpkgs/qt-webkit/template
@@ -1,113 +1,11 @@
# Template file for 'qt-webkit'
pkgname=qt-webkit
version=2.3.4
-revision=7
-_qtver=4.8.7
-wrksrc="qtwebkit-${version}"
-create_wrksrc=yes
-hostmakedepends="automake libtool bison flex gperf python ruby pkg-config qt-qmake"
-makedepends="MesaLib-devel libjpeg-turbo-devel qt-devel qt-designer-devel
- glib-devel fontconfig-devel gst-plugins-base1-devel sqlite-devel libXrender-devel"
-short_desc="Open source web browser engine (Qt4 port)"
+revision=8
+build_style=meta
+short_desc="Open source web browser engine (Qt4 port) (removed package)"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="LGPL-2.1, GPL-3"
+license="BSD-2-Clause"
homepage="http://trac.webkit.org/wiki/QtWebKit"
-distfiles="
- http://download.kde.org/stable/qtwebkit-${version%.*}/${version}/src/qtwebkit-${version}.tar.gz
- http://download.qt.io/official_releases/qt/${_qtver%.*}/${_qtver}/qt-everywhere-opensource-src-${_qtver}.tar.gz"
-checksum="
- c6cfa9d068f7eb024fee3f6c24f5b8b726997f669007587f35ed4a97d40097ca
- e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0"
conflicts="qt<4.8.7_12"
-
-if [ -n "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt-devel qt-designer-devel"
-fi
-
-# Use the same value for -std= as in qt
-CXXFLAGS="-std=gnu++98 -Wno-deprecated -fno-delete-null-pointer-checks -fno-lifetime-dse"
-
-post_extract() {
- patch -p1 < ${FILESDIR}/fix-gcc6.patch
- patch -p1 < ${FILESDIR}/fix-execinfo.patch
- patch -p1 < ${FILESDIR}/fix-mallinfo.patch
- patch -p0 < ${FILESDIR}/qwebview.patch
- mv qt-everywhere-opensource-src-${_qtver} ..
-}
-
-do_configure() {
- :
-}
-
-do_build() {
- local opts="--qt --prefix=/usr --no-webkit2 --release"
- case "$XBPS_TARGET_MACHINE" in
- i686*) # Do not force SSE2 for i686
- opts+=" --no-force-sse2"
- ;;
- aarch64*)
- # Disable JIT
- opts+=" DEFINES+=ENABLE_JIT=0"
- opts+=" DEFINES+=ENABLE_YARR_JIT=0"
- ;;
- arm*|mips*|ppc*)
- # Disable JIT and assembler
- opts+=" DEFINES+=ENABLE_JIT=0"
- opts+=" DEFINES+=ENABLE_YARR_JIT=0"
- opts+=" DEFINES+=ENABLE_ASSEMBLER=0"
- ;;
- esac
- if [ -n "$CROSS_BUILD" ]; then
- opts+=" --qmakearg=\"CONFIG+=production_build\""
- opts+=" --qmakearg=\"QMAKE_CC=$CC\""
- opts+=" --qmakearg=\"QMAKE_CXX=$CXX\""
- opts+=" --qmakearg=\"QMAKE_LINK=$CXX\""
- opts+=" --qmakearg=\"QMAKE_LINK_SHARED=$CXX\""
- opts+=" --qmakearg=\"QMAKE_AR=$AR cru\""
- opts+=" --qmakearg=\"QMAKE_OBJDUMP=$OBJDUMP\""
- opts+=" --qmakearg=\"QMAKE_CFLAGS='$CFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_CFLAGS_RELEASE='$CFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_CXXFLAGS='$CXXFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_CXXFLAGS_RELEASE='$CXXFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_LFLAGS='$LDFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_LFLAGS_RELEASE='$LDFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_INCDIR=${XBPS_CROSS_BASE}/usr/include\""
- opts+=" --qmakearg=\"QMAKE_INCDIR_QT=${XBPS_CROSS_BASE}/usr/include\""
- fi
- export QTDIR=/usr
- export PATH="/usr/lib/qt/bin:$PATH"
- find -name "Makefile*" -exec sed -i "{}" \
- -e"s;^\(CC[ ]*=\).*;\1 $CC;" \
- -e"s;^\(CXX[ ]*=\).*;\1 $CXX;" \
- -e"s;^\(LINK[ ]*=\).*;\1 $CXX;" \
- -e"s;^\(CFLAGS[ ]*=\)\(.*\);\1 \2 $CFLAGS;" \
- -e"s;^\(CXXFLAGS[ ]*=\)\(.*\);\1 \2 $CXXFLAGS;" \
- -e"s;^\(LFLAGS[ ]*=\)\(.*\);\1 \2 $LDFLAGS;" \
- \;
- Tools/Scripts/build-webkit --makeargs="${makejobs}" ${opts}
- cd ../qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview
- qmake QMAKE_CFLAGS="$CFLAGS" QMAKE_CXXFLAGS="$CXXFLAGS" QMAKE_LFLAGS="$LDFLAGS"
- make ${makejobs} CC="$CC" CXX="$CXX" LINK="$CXX"
-}
-
-do_install() {
- make INSTALL_ROOT="${DESTDIR}" -C WebKitBuild/Release install
- cd ../qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview
- make INSTALL_ROOT="${DESTDIR}" install
-
- # Remove references to the build directory from .prl and .pc files
- sed -i 's| -L.*/*/release||g' ${DESTDIR}/usr/lib/pkgconfig/QtWebKit.pc
- sed -i '/^QMAKE_PRL_BUILD_DIR/d' ${DESTDIR}/usr/lib/libQtWebKit.prl
-}
-
-qt-webkit-devel_package() {
- short_desc+=" - development files"
- depends="qt-devel ${sourcepkg}>=${version}_${revision}"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/*.so
- vmove usr/lib/*.prl
- vmove usr/lib/pkgconfig
- vmove usr/share/qt/mkspecs
- }
-}
+replaces="qt-webkit-devel>=0"
From 2fed8d28114802051a5be0627fc83f73d9ee187e Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Tue, 17 Sep 2019 14:48:33 +0200
Subject: [PATCH 2/6] phonon: remove
---
common/shlibs | 2 --
srcpkgs/phonon-devel | 1 -
srcpkgs/phonon/INSTALL.msg | 1 +
srcpkgs/phonon/template | 34 +++++-----------------------------
4 files changed, 6 insertions(+), 32 deletions(-)
delete mode 120000 srcpkgs/phonon-devel
create mode 100644 srcpkgs/phonon/INSTALL.msg
diff --git a/common/shlibs b/common/shlibs
index 58260aabca0..bc6b78029e9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1312,8 +1312,6 @@ libdb-5.3.so libdb-5.3.21_1
libdb_cxx-5.3.so libdb-cxx-5.3.21_1
libcares.so.2 c-ares-1.10.0_1
libcryptopp.so.5.6 crypto++-565_1
-libphonon.so.4 phonon-4.6.0_1
-libphononexperimental.so.4 phonon-4.6.0_1
libdbusmenu-glib.so.4 libdbusmenu-glib-12.10.2_1
libdbusmenu-gtk3.so.4 libdbusmenu-gtk3-12.10.2_1
libGrantlee_Templates.so.5 grantlee5-5.0.0_1
diff --git a/srcpkgs/phonon-devel b/srcpkgs/phonon-devel
deleted file mode 120000
index ce8c63abf05..00000000000
--- a/srcpkgs/phonon-devel
+++ /dev/null
@@ -1 +0,0 @@
-phonon
\ No newline at end of file
diff --git a/srcpkgs/phonon/INSTALL.msg b/srcpkgs/phonon/INSTALL.msg
new file mode 100644
index 00000000000..0b787f67a35
--- /dev/null
+++ b/srcpkgs/phonon/INSTALL.msg
@@ -0,0 +1 @@
+phonon is no longer provided by Void Linux, and will be fully removed from the repos on 2019-12-17
diff --git a/srcpkgs/phonon/template b/srcpkgs/phonon/template
index e48f009869d..5f642bdbad2 100644
--- a/srcpkgs/phonon/template
+++ b/srcpkgs/phonon/template
@@ -1,34 +1,10 @@
# Template file for 'phonon'
pkgname=phonon
version=4.9.1
-revision=2
-build_style=cmake
-configure_args="-Wno-dev -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE"
-hostmakedepends="pkg-config automoc4"
-makedepends="glib-devel qt-devel pulseaudio-devel"
-short_desc="Multimedia framework for KDE (Qt 4.x)"
+revision=3
+build_style=meta
+short_desc="Multimedia framework for KDE (Qt 4.x) (removed package)"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-or-later"
+license="BSD-2-Clause"
homepage="https://phonon.kde.org/"
-distfiles="${KDE_SITE}/${pkgname}/${version}/${pkgname}-${version}.tar.xz"
-checksum=67bee986f85ca8b575186c8ba58a85886cb3b1c3567c86a118d56129f221e69c
-
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt-devel"
-fi
-
-post_install() {
- # Create compat symlink for QT phonon.
- vmkdir usr/lib/qt/plugins
- ln -s /usr/lib/kde4/plugins/phonon_backend ${DESTDIR}/usr/lib/qt/plugins
-}
-
-phonon-devel_package() {
- depends="qt-devel ${sourcepkg}-${version}_${revision}"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/cmake
- vmove usr/lib/pkgconfig
- vmove usr/share/phonon
- }
-}
+replaces="phonon-devel>=0"
From f368a1d542d3169f644ba5fdcfc31d0662d28099 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Tue, 17 Sep 2019 14:57:21 +0200
Subject: [PATCH 3/6] luxmark: remove
---
srcpkgs/luxmark/INSTALL.msg | 1 +
srcpkgs/luxmark/template | 23 +++--------------------
srcpkgs/luxmark/update | 2 --
3 files changed, 4 insertions(+), 22 deletions(-)
create mode 100644 srcpkgs/luxmark/INSTALL.msg
delete mode 100644 srcpkgs/luxmark/update
diff --git a/srcpkgs/luxmark/INSTALL.msg b/srcpkgs/luxmark/INSTALL.msg
new file mode 100644
index 00000000000..70228207809
--- /dev/null
+++ b/srcpkgs/luxmark/INSTALL.msg
@@ -0,0 +1 @@
+luxmark is no longer provided by Void Linux, and will be fully removed from the repos on 2019-12-17
diff --git a/srcpkgs/luxmark/template b/srcpkgs/luxmark/template
index 588f76046fc..f2524539a36 100644
--- a/srcpkgs/luxmark/template
+++ b/srcpkgs/luxmark/template
@@ -1,26 +1,9 @@
# Template file for 'luxmark'
pkgname=luxmark
version=3.1
-revision=7
-build_style=cmake
-makedepends="openimageio-devel tiff-devel libpng-devel libgomp-devel
- libopenexr-devel MesaLib-devel ocl-icd-devel opencl-headers boost-devel
- python-devel luxrays-devel glew-devel libfreeglut-devel qt-devel opencl-clhpp"
-short_desc="OpenCL benchmark based on LuxCore"
+revision=8
+build_style=meta
+short_desc="OpenCL benchmark based on LuxCore (removed package)"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3"
homepage="http://www.luxrender.net/wiki/LuxMark"
-distfiles="https://bitbucket.org/luxrender/luxmark/get/${pkgname}_v${version}.tar.gz"
-checksum=175cc38f8a3cb73cf2ef25d6e99981456d66e1f9c7fb362522e7e58319c026e6
-
-configure_args=" -DCMAKE_SKIP_RPATH=ON"
-
-post_extract() {
- mv $XBPS_BUILDDIR/luxrender-luxmark* $wrksrc
-}
-
-do_install() {
- vbin build/bin/luxmark
- vmkdir usr/share/luxmark
- vcopy scenes usr/share/luxmark
-}
diff --git a/srcpkgs/luxmark/update b/srcpkgs/luxmark/update
deleted file mode 100644
index 24c7a3b659e..00000000000
--- a/srcpkgs/luxmark/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://bitbucket.org/api/1.0/repositories/luxrender/luxmark/tags"
-pattern='luxmark_v\K([\d.]+)(?=")'
From 64a081c826ad4472bbef6f58e01891d07c44a29d Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Tue, 17 Sep 2019 14:59:48 +0200
Subject: [PATCH 4/6] qucs: remove
---
srcpkgs/qucs/INSTALL.msg | 1 +
.../patches/qucsator-fix-list-traversion.patch | 17 -----------------
srcpkgs/qucs/template | 12 +++---------
3 files changed, 4 insertions(+), 26 deletions(-)
create mode 100644 srcpkgs/qucs/INSTALL.msg
delete mode 100644 srcpkgs/qucs/patches/qucsator-fix-list-traversion.patch
diff --git a/srcpkgs/qucs/INSTALL.msg b/srcpkgs/qucs/INSTALL.msg
new file mode 100644
index 00000000000..b35fd8aa61a
--- /dev/null
+++ b/srcpkgs/qucs/INSTALL.msg
@@ -0,0 +1 @@
+qucs is no longer provided by Void Linux, and will be fully removed from the repos on 2019-12-17
diff --git a/srcpkgs/qucs/patches/qucsator-fix-list-traversion.patch b/srcpkgs/qucs/patches/qucsator-fix-list-traversion.patch
deleted file mode 100644
index c22a608adc0..00000000000
--- a/srcpkgs/qucs/patches/qucsator-fix-list-traversion.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- qucs-core/src/net.cpp.org 2017-09-13 20:47:24.863069583 +0200
-+++ qucs-core/src/net.cpp 2017-09-10 00:16:48.863636748 +0200
-@@ -350,7 +350,13 @@
- void net::sortChildAnalyses (analysis * parent) {
- ptrlist<analysis> * alist = parent->getAnalysis ();
- if (alist != nullptr) {
-- for (auto *a: *alist) {
-+
-+ for (auto it = alist->begin(); it != alist->end(); /* empty */) {
-+ // Copy the value of the element (a pointer), and advance the
-+ // iterator prior to manipulating the list.
-+ analysis *a = *it;
-+ ++it;
-+
- if (a->getType () == ANALYSIS_DC
- || containsAnalysis (a, ANALYSIS_DC)) {
- parent->delAnalysis (a);
diff --git a/srcpkgs/qucs/template b/srcpkgs/qucs/template
index 4c18a3258c3..0eb22b505b9 100644
--- a/srcpkgs/qucs/template
+++ b/srcpkgs/qucs/template
@@ -1,15 +1,9 @@
# Template file for 'qucs'
pkgname=qucs
version=0.0.19
-revision=2
-build_style=gnu-configure
-configure_args="--disable-doc"
-hostmakedepends="ADMS-qucs gperf qt-devel"
-makedepends="qt-devel"
-short_desc="Quite Universal Circuit Simulator"
+revision=3
+build_style=meta
+short_desc="Quite Universal Circuit Simulator (removed package)"
maintainer="Martijn van Buul <martijn.van.buul@gmail.com>"
license="GPL-2"
homepage="http://qucs.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${version}/${pkgname}-${version}.tar.gz"
-checksum="45c6434fde24c533e63550675ac21cdbd3cc6cbba29b82a1dc3f36e7dd4b3b3e"
-nocross="yes" # seems to compile all the way, but seems to link against the wrong libX11 (at least)
From d778f66c9132788a7c57464afbe1d7b13107072c Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Tue, 17 Sep 2019 15:05:03 +0200
Subject: [PATCH 5/6] automoc4: remove
---
srcpkgs/automoc4/INSTALL.msg | 1 +
srcpkgs/automoc4/template | 19 +++----------------
2 files changed, 4 insertions(+), 16 deletions(-)
create mode 100644 srcpkgs/automoc4/INSTALL.msg
diff --git a/srcpkgs/automoc4/INSTALL.msg b/srcpkgs/automoc4/INSTALL.msg
new file mode 100644
index 00000000000..779b8bcb9b2
--- /dev/null
+++ b/srcpkgs/automoc4/INSTALL.msg
@@ -0,0 +1 @@
+automoc4 is no longer provided by Void Linux, and will be fully removed from the repos on 2019-12-17
diff --git a/srcpkgs/automoc4/template b/srcpkgs/automoc4/template
index 3b04eb2589c..41197be45d5 100644
--- a/srcpkgs/automoc4/template
+++ b/srcpkgs/automoc4/template
@@ -1,22 +1,9 @@
# Template file for 'automoc4'
pkgname=automoc4
version=0.9.88
-revision=4
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="qt-devel"
-short_desc="Automatic moc for Qt 4 packages"
+revision=5
+build_style=meta
+short_desc="Automatic moc for Qt 4 packages (removed package)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-2-Clause"
homepage="http://techbase.kde.org/Development/Tools/Automoc4"
-distfiles="${KDE_SITE}/automoc4/${version}/automoc4-${version}.tar.bz2"
-checksum=234116f4c05ae21d828594d652b4c4a052ef75727e2d8a4f3a4fb605de9e4c49
-
-if [ -n "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt-qmake qt-host-tools"
-fi
-
-post_install() {
- sed -n '/Copyright/,/SUCH\./p' kde4automoc.cpp > LICENSE
- vlicense LICENSE
-}
From e09945ea283f24b6ab8a48763546f25839c27d57 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Tue, 17 Sep 2019 15:09:43 +0200
Subject: [PATCH 6/6] avogadro: remove
---
common/shlibs | 2 --
srcpkgs/avogadro-devel | 1 -
srcpkgs/avogadro/INSTALL.msg | 1 +
srcpkgs/avogadro/template | 35 ++++-------------------------------
4 files changed, 5 insertions(+), 34 deletions(-)
delete mode 120000 srcpkgs/avogadro-devel
create mode 100644 srcpkgs/avogadro/INSTALL.msg
diff --git a/common/shlibs b/common/shlibs
index bc6b78029e9..dd76aa0f6e8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2609,8 +2609,6 @@ libmono-btls-shared.so mono-5.2.0.215_1
libxcb-xrm.so.0 xcb-util-xrm-1.0_1
libinchi.so.0 openbabel-2.3.2_1
libopenbabel.so.5 openbabel-2.4.1_1
-libavogadro.so.1 avogadro-1.2.0_1
-libavogadro_OpenQube.so.0 avogadro-1.2.0_1
libcourier-unicode.so.4 courier-unicode-2.0_1
libzstd.so.1 libzstd-1.0.0_1
libudis86.so.0 udis86-1.7.2_4
diff --git a/srcpkgs/avogadro-devel b/srcpkgs/avogadro-devel
deleted file mode 120000
index 9ed7d75d9d2..00000000000
--- a/srcpkgs/avogadro-devel
+++ /dev/null
@@ -1 +0,0 @@
-avogadro
\ No newline at end of file
diff --git a/srcpkgs/avogadro/INSTALL.msg b/srcpkgs/avogadro/INSTALL.msg
new file mode 100644
index 00000000000..3ff9aea1379
--- /dev/null
+++ b/srcpkgs/avogadro/INSTALL.msg
@@ -0,0 +1 @@
+avogadro is no longer provided by Void Linux, and will be fully removed from the repos on 2019-12-17
diff --git a/srcpkgs/avogadro/template b/srcpkgs/avogadro/template
index 03b886f1e0d..b3601609837 100644
--- a/srcpkgs/avogadro/template
+++ b/srcpkgs/avogadro/template
@@ -1,37 +1,10 @@
# Template file for 'avogadro'
pkgname=avogadro
version=1.2.0
-revision=8
-build_style=cmake
-configure_args="-DENABLE_TESTING:BOOL=OFF"
-hostmakedepends="pkg-config doxygen"
-makedepends="openbabel-devel qt-devel glew-devel zlib-devel boost-devel
- python-devel hdf5-devel eigen3.2"
-short_desc="An intuitive molecular editor and visualization tool"
+revision=9
+build_style=meta
+short_desc="An intuitive molecular editor and visualization tool (removed package)"
maintainer="Diogo Leal <diogo@diogoleal.com>"
license="GPL-2"
homepage="http://avogadro.cc"
-distfiles="https://github.com/cryos/avogadro/archive/${version}.tar.gz"
-checksum=6453e36e8ae3e61655cbe062df6d6fa6b2409122c7b5abc0a6f1d410a181640b
-
-pre_build() {
- sed -i 's|_BSD_SOURCE|_DEFAULT_SOURCE|g' CMakeLists.txt
-}
-post_install() {
- rm -rf ${DESTDIR}/usr/features
-}
-
-avogadro-devel_package() {
- depends="${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/*.a
- vmove usr/lib/*.so
- vmove usr/lib/cmake
- vmove usr/lib/pkgconfig
- vmove usr/lib/avogadro/*.cmake
- subver=${version%.*}
- vmove usr/lib/avogadro/${subver%.*}_${subver#*.}/*cmake
- }
-}
+replaces="avogadro-devel>=0"
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] qt: remove
2019-09-17 12:40 [PR PATCH] qt-webkit: remove voidlinux-github
` (6 preceding siblings ...)
2019-09-17 13:11 ` voidlinux-github
@ 2019-09-17 13:11 ` voidlinux-github
2019-09-17 16:38 ` voidlinux-github
` (2 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: voidlinux-github @ 2019-09-17 13:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 427 bytes --]
There is an updated pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages qt-webkit
https://github.com/void-linux/void-packages/pull/14520
[WIP] qt: remove
there are also a few python*-PyQt4-* packages in the binary repos that have to be removed.
And python3-pyside*
A patch file from https://github.com/void-linux/void-packages/pull/14520.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt-webkit-14520.patch --]
[-- Type: text/x-diff, Size: 24196 bytes --]
From 3ae3b4f5b6a5b4fbf7ade15c7176e02f110714c3 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Tue, 17 Sep 2019 14:33:08 +0200
Subject: [PATCH 1/6] qt-webkit: remove
---
common/shlibs | 1 -
srcpkgs/qt-webkit-devel | 1 -
srcpkgs/qt-webkit/INSTALL.msg | 1 +
srcpkgs/qt-webkit/files/fix-execinfo.patch | 20 ----
srcpkgs/qt-webkit/files/fix-gcc6.patch | 14 ---
srcpkgs/qt-webkit/files/fix-mallinfo.patch | 11 --
.../files/fix-saturated_arithmetic.patch | 20 ----
srcpkgs/qt-webkit/files/qwebview.patch | 21 ----
srcpkgs/qt-webkit/template | 112 +-----------------
9 files changed, 6 insertions(+), 195 deletions(-)
delete mode 120000 srcpkgs/qt-webkit-devel
create mode 100644 srcpkgs/qt-webkit/INSTALL.msg
delete mode 100644 srcpkgs/qt-webkit/files/fix-execinfo.patch
delete mode 100644 srcpkgs/qt-webkit/files/fix-gcc6.patch
delete mode 100644 srcpkgs/qt-webkit/files/fix-mallinfo.patch
delete mode 100644 srcpkgs/qt-webkit/files/fix-saturated_arithmetic.patch
delete mode 100644 srcpkgs/qt-webkit/files/qwebview.patch
diff --git a/common/shlibs b/common/shlibs
index d15941dce29..58260aabca0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -456,7 +456,6 @@ libQtSql.so.4 qt-4.5.3_1
libQtDeclarative.so.4 qt-4.5.3_1
libQtDesignerComponents.so.4 qt-designer-libs-4.7.8_13
libQtDesigner.so.4 qt-designer-libs-4.7.8_13
-libQtWebKit.so.4 qt-webkit-2.3.4_1
libsysfs.so.2 libsysfs-2.1.0_1
libsensors.so.5 libsensors-3.5.0_1
libcap-ng.so.0 libcap-ng-0.6.2_1
diff --git a/srcpkgs/qt-webkit-devel b/srcpkgs/qt-webkit-devel
deleted file mode 120000
index f3c82c42591..00000000000
--- a/srcpkgs/qt-webkit-devel
+++ /dev/null
@@ -1 +0,0 @@
-qt-webkit
\ No newline at end of file
diff --git a/srcpkgs/qt-webkit/INSTALL.msg b/srcpkgs/qt-webkit/INSTALL.msg
new file mode 100644
index 00000000000..07765985647
--- /dev/null
+++ b/srcpkgs/qt-webkit/INSTALL.msg
@@ -0,0 +1 @@
+qt-webkit is no longer provided by Void Linux, and will be fully removed from the repos on 2019-12-17
diff --git a/srcpkgs/qt-webkit/files/fix-execinfo.patch b/srcpkgs/qt-webkit/files/fix-execinfo.patch
deleted file mode 100644
index 93a4dec73fa..00000000000
--- a/srcpkgs/qt-webkit/files/fix-execinfo.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- qtwebkit-2.3.4/Source/WTF/wtf/Assertions.cpp 2014-09-24 13:42:05.000000000 +0200
-+++ qtwebkit-2.3.4/Source/WTF/wtf/Assertions.cpp 2016-09-17 23:37:12.846758706 +0200
-@@ -58,7 +58,7 @@
- #include <windows.h>
- #endif
-
--#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
-+#if (OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__))) && !OS(ANDROID)
- #include <cxxabi.h>
- #include <dlfcn.h>
- #include <execinfo.h>
-@@ -242,7 +242,7 @@
-
- void WTFGetBacktrace(void** stack, int* size)
- {
--#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
-+#if (OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__))) && !OS(ANDROID)
- *size = backtrace(stack, *size);
- #elif OS(WINDOWS) && !OS(WINCE)
- // The CaptureStackBackTrace function is available in XP, but it is not defined
diff --git a/srcpkgs/qt-webkit/files/fix-gcc6.patch b/srcpkgs/qt-webkit/files/fix-gcc6.patch
deleted file mode 100644
index 6e6215c7e25..00000000000
--- a/srcpkgs/qt-webkit/files/fix-gcc6.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- webkit-qtwebkit-23/Source/JavaScriptCore/runtime/JSObject.cpp.gcc5 2014-09-24 06:42:05.000000000 -0500
-+++ webkit-qtwebkit-23/Source/JavaScriptCore/runtime/JSObject.cpp 2015-03-20 08:15:53.192778375 -0500
-@@ -1922,6 +1922,10 @@ void JSObject::putByIndexBeyondVectorLen
- }
- }
-
-+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<ContiguousShape>(ExecState* exec, unsigned i, JSValue value);
-+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<DoubleShape>(ExecState* exec, unsigned i, JSValue value);
-+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<Int32Shape>(ExecState* exec, unsigned i, JSValue value);
-+
- void JSObject::putByIndexBeyondVectorLengthWithArrayStorage(ExecState* exec, unsigned i, JSValue value, bool shouldThrow, ArrayStorage* storage)
- {
- JSGlobalData& globalData = exec->globalData();
-
diff --git a/srcpkgs/qt-webkit/files/fix-mallinfo.patch b/srcpkgs/qt-webkit/files/fix-mallinfo.patch
deleted file mode 100644
index 60c5d085fe0..00000000000
--- a/srcpkgs/qt-webkit/files/fix-mallinfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qtwebkit-2.3.4/Source/WebCore/platform/qt/MemoryUsageSupportQt.cpp 2014-09-24 13:42:05.000000000 +0200
-+++ qtwebkit-2.3.4/Source/WebCore/platform/qt/MemoryUsageSupportQt.cpp 2016-09-17 23:48:23.558775636 +0200
-@@ -31,7 +31,7 @@
-
- namespace WebCore {
-
--#if OS(LINUX)
-+#if OS(LINUX) && defined(__GLIBC__)
- static size_t mallocMemoryUsage(bool inuse)
- {
- // Return how much memory (in bytes) has been allocated on the system heap.
diff --git a/srcpkgs/qt-webkit/files/fix-saturated_arithmetic.patch b/srcpkgs/qt-webkit/files/fix-saturated_arithmetic.patch
deleted file mode 100644
index f9a18220a99..00000000000
--- a/srcpkgs/qt-webkit/files/fix-saturated_arithmetic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- qtwebkit-2.3.4/Source/WTF/wtf/SaturatedArithmetic.h 2014-09-24 13:42:05.000000000 +0200
-+++ qtwebkit-2.3.4/Source/WTF/wtf/SaturatedArithmetic.h 2017-02-19 16:27:58.343676787 +0100
-@@ -43,7 +43,7 @@
-
- // Can only overflow if the signed bit of the two values match. If the signed
- // bit of the result and one of the values differ it did overflow.
-- if (!((ua ^ ub) >> 31) & (result ^ ua) >> 31)
-+ if (~((ua ^ ub) >> 31) & ((result ^ ua) >> 31))
- result = std::numeric_limits<int>::max() + (ua >> 31);
-
- return result;
-@@ -57,7 +57,7 @@
-
- // Can only overflow if the signed bit of the two values do not match. If the
- // signed bit of the result and the first value differ it did overflow.
-- if ((ua ^ ub) >> 31 & (result ^ ua) >> 31)
-+ if (((ua ^ ub) >> 31) & ((result ^ ua) >> 31))
- result = std::numeric_limits<int>::max() + (ua >> 31);
-
- return result;
diff --git a/srcpkgs/qt-webkit/files/qwebview.patch b/srcpkgs/qt-webkit/files/qwebview.patch
deleted file mode 100644
index f8aa8c3101b..00000000000
--- a/srcpkgs/qt-webkit/files/qwebview.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- qt-everywhere-opensource-src-4.8.7/tools/designer/src/plugins/plugins.pri~ 2013-01-09 12:56:08.915412090 +0000
-+++ qt-everywhere-opensource-src-4.8.7/tools/designer/src/plugins/plugins.pri 2013-01-09 12:58:06.911391299 +0000
-@@ -1,3 +1,6 @@
-+INCLUDEPATH += ../../../../../../qtwebkit-2.3.4/WebKitBuild/Release/include
-+LIBS += -L../../../../../../qtwebkit-2.3.4/WebKitBuild/Release/lib
-+
- CONFIG += designer
- win32|mac: CONFIG+= debug_and_release
- QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/designer
---- qt-everywhere-opensource-src-4.8.7/tools/designer/src/plugins/plugins.pro~ 2013-01-09 12:55:43.598892405 +0000
-+++ qt-everywhere-opensource-src-4.8.7/tools/designer/src/plugins/plugins.pro 2013-01-09 12:55:53.352169136 +0000
-@@ -2,9 +2,4 @@
- CONFIG += ordered
-
- REQUIRES = !CONFIG(static,shared|static)
--contains(QT_CONFIG, qt3support): SUBDIRS += widgets
--win32: SUBDIRS += activeqt
--# contains(QT_CONFIG, opengl): SUBDIRS += tools/view3d
- contains(QT_CONFIG, webkit): SUBDIRS += qwebview
--contains(QT_CONFIG, phonon): SUBDIRS += phononwidgets
--contains(QT_CONFIG, declarative): SUBDIRS += qdeclarativeview
diff --git a/srcpkgs/qt-webkit/template b/srcpkgs/qt-webkit/template
index 1c3ff6c0ee2..ecaa15fcd16 100644
--- a/srcpkgs/qt-webkit/template
+++ b/srcpkgs/qt-webkit/template
@@ -1,113 +1,11 @@
# Template file for 'qt-webkit'
pkgname=qt-webkit
version=2.3.4
-revision=7
-_qtver=4.8.7
-wrksrc="qtwebkit-${version}"
-create_wrksrc=yes
-hostmakedepends="automake libtool bison flex gperf python ruby pkg-config qt-qmake"
-makedepends="MesaLib-devel libjpeg-turbo-devel qt-devel qt-designer-devel
- glib-devel fontconfig-devel gst-plugins-base1-devel sqlite-devel libXrender-devel"
-short_desc="Open source web browser engine (Qt4 port)"
+revision=8
+build_style=meta
+short_desc="Open source web browser engine (Qt4 port) (removed package)"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="LGPL-2.1, GPL-3"
+license="BSD-2-Clause"
homepage="http://trac.webkit.org/wiki/QtWebKit"
-distfiles="
- http://download.kde.org/stable/qtwebkit-${version%.*}/${version}/src/qtwebkit-${version}.tar.gz
- http://download.qt.io/official_releases/qt/${_qtver%.*}/${_qtver}/qt-everywhere-opensource-src-${_qtver}.tar.gz"
-checksum="
- c6cfa9d068f7eb024fee3f6c24f5b8b726997f669007587f35ed4a97d40097ca
- e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0"
conflicts="qt<4.8.7_12"
-
-if [ -n "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt-devel qt-designer-devel"
-fi
-
-# Use the same value for -std= as in qt
-CXXFLAGS="-std=gnu++98 -Wno-deprecated -fno-delete-null-pointer-checks -fno-lifetime-dse"
-
-post_extract() {
- patch -p1 < ${FILESDIR}/fix-gcc6.patch
- patch -p1 < ${FILESDIR}/fix-execinfo.patch
- patch -p1 < ${FILESDIR}/fix-mallinfo.patch
- patch -p0 < ${FILESDIR}/qwebview.patch
- mv qt-everywhere-opensource-src-${_qtver} ..
-}
-
-do_configure() {
- :
-}
-
-do_build() {
- local opts="--qt --prefix=/usr --no-webkit2 --release"
- case "$XBPS_TARGET_MACHINE" in
- i686*) # Do not force SSE2 for i686
- opts+=" --no-force-sse2"
- ;;
- aarch64*)
- # Disable JIT
- opts+=" DEFINES+=ENABLE_JIT=0"
- opts+=" DEFINES+=ENABLE_YARR_JIT=0"
- ;;
- arm*|mips*|ppc*)
- # Disable JIT and assembler
- opts+=" DEFINES+=ENABLE_JIT=0"
- opts+=" DEFINES+=ENABLE_YARR_JIT=0"
- opts+=" DEFINES+=ENABLE_ASSEMBLER=0"
- ;;
- esac
- if [ -n "$CROSS_BUILD" ]; then
- opts+=" --qmakearg=\"CONFIG+=production_build\""
- opts+=" --qmakearg=\"QMAKE_CC=$CC\""
- opts+=" --qmakearg=\"QMAKE_CXX=$CXX\""
- opts+=" --qmakearg=\"QMAKE_LINK=$CXX\""
- opts+=" --qmakearg=\"QMAKE_LINK_SHARED=$CXX\""
- opts+=" --qmakearg=\"QMAKE_AR=$AR cru\""
- opts+=" --qmakearg=\"QMAKE_OBJDUMP=$OBJDUMP\""
- opts+=" --qmakearg=\"QMAKE_CFLAGS='$CFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_CFLAGS_RELEASE='$CFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_CXXFLAGS='$CXXFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_CXXFLAGS_RELEASE='$CXXFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_LFLAGS='$LDFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_LFLAGS_RELEASE='$LDFLAGS'\""
- opts+=" --qmakearg=\"QMAKE_INCDIR=${XBPS_CROSS_BASE}/usr/include\""
- opts+=" --qmakearg=\"QMAKE_INCDIR_QT=${XBPS_CROSS_BASE}/usr/include\""
- fi
- export QTDIR=/usr
- export PATH="/usr/lib/qt/bin:$PATH"
- find -name "Makefile*" -exec sed -i "{}" \
- -e"s;^\(CC[ ]*=\).*;\1 $CC;" \
- -e"s;^\(CXX[ ]*=\).*;\1 $CXX;" \
- -e"s;^\(LINK[ ]*=\).*;\1 $CXX;" \
- -e"s;^\(CFLAGS[ ]*=\)\(.*\);\1 \2 $CFLAGS;" \
- -e"s;^\(CXXFLAGS[ ]*=\)\(.*\);\1 \2 $CXXFLAGS;" \
- -e"s;^\(LFLAGS[ ]*=\)\(.*\);\1 \2 $LDFLAGS;" \
- \;
- Tools/Scripts/build-webkit --makeargs="${makejobs}" ${opts}
- cd ../qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview
- qmake QMAKE_CFLAGS="$CFLAGS" QMAKE_CXXFLAGS="$CXXFLAGS" QMAKE_LFLAGS="$LDFLAGS"
- make ${makejobs} CC="$CC" CXX="$CXX" LINK="$CXX"
-}
-
-do_install() {
- make INSTALL_ROOT="${DESTDIR}" -C WebKitBuild/Release install
- cd ../qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview
- make INSTALL_ROOT="${DESTDIR}" install
-
- # Remove references to the build directory from .prl and .pc files
- sed -i 's| -L.*/*/release||g' ${DESTDIR}/usr/lib/pkgconfig/QtWebKit.pc
- sed -i '/^QMAKE_PRL_BUILD_DIR/d' ${DESTDIR}/usr/lib/libQtWebKit.prl
-}
-
-qt-webkit-devel_package() {
- short_desc+=" - development files"
- depends="qt-devel ${sourcepkg}>=${version}_${revision}"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/*.so
- vmove usr/lib/*.prl
- vmove usr/lib/pkgconfig
- vmove usr/share/qt/mkspecs
- }
-}
+replaces="qt-webkit-devel>=0"
From 2fed8d28114802051a5be0627fc83f73d9ee187e Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Tue, 17 Sep 2019 14:48:33 +0200
Subject: [PATCH 2/6] phonon: remove
---
common/shlibs | 2 --
srcpkgs/phonon-devel | 1 -
srcpkgs/phonon/INSTALL.msg | 1 +
srcpkgs/phonon/template | 34 +++++-----------------------------
4 files changed, 6 insertions(+), 32 deletions(-)
delete mode 120000 srcpkgs/phonon-devel
create mode 100644 srcpkgs/phonon/INSTALL.msg
diff --git a/common/shlibs b/common/shlibs
index 58260aabca0..bc6b78029e9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1312,8 +1312,6 @@ libdb-5.3.so libdb-5.3.21_1
libdb_cxx-5.3.so libdb-cxx-5.3.21_1
libcares.so.2 c-ares-1.10.0_1
libcryptopp.so.5.6 crypto++-565_1
-libphonon.so.4 phonon-4.6.0_1
-libphononexperimental.so.4 phonon-4.6.0_1
libdbusmenu-glib.so.4 libdbusmenu-glib-12.10.2_1
libdbusmenu-gtk3.so.4 libdbusmenu-gtk3-12.10.2_1
libGrantlee_Templates.so.5 grantlee5-5.0.0_1
diff --git a/srcpkgs/phonon-devel b/srcpkgs/phonon-devel
deleted file mode 120000
index ce8c63abf05..00000000000
--- a/srcpkgs/phonon-devel
+++ /dev/null
@@ -1 +0,0 @@
-phonon
\ No newline at end of file
diff --git a/srcpkgs/phonon/INSTALL.msg b/srcpkgs/phonon/INSTALL.msg
new file mode 100644
index 00000000000..0b787f67a35
--- /dev/null
+++ b/srcpkgs/phonon/INSTALL.msg
@@ -0,0 +1 @@
+phonon is no longer provided by Void Linux, and will be fully removed from the repos on 2019-12-17
diff --git a/srcpkgs/phonon/template b/srcpkgs/phonon/template
index e48f009869d..5f642bdbad2 100644
--- a/srcpkgs/phonon/template
+++ b/srcpkgs/phonon/template
@@ -1,34 +1,10 @@
# Template file for 'phonon'
pkgname=phonon
version=4.9.1
-revision=2
-build_style=cmake
-configure_args="-Wno-dev -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE"
-hostmakedepends="pkg-config automoc4"
-makedepends="glib-devel qt-devel pulseaudio-devel"
-short_desc="Multimedia framework for KDE (Qt 4.x)"
+revision=3
+build_style=meta
+short_desc="Multimedia framework for KDE (Qt 4.x) (removed package)"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-or-later"
+license="BSD-2-Clause"
homepage="https://phonon.kde.org/"
-distfiles="${KDE_SITE}/${pkgname}/${version}/${pkgname}-${version}.tar.xz"
-checksum=67bee986f85ca8b575186c8ba58a85886cb3b1c3567c86a118d56129f221e69c
-
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt-devel"
-fi
-
-post_install() {
- # Create compat symlink for QT phonon.
- vmkdir usr/lib/qt/plugins
- ln -s /usr/lib/kde4/plugins/phonon_backend ${DESTDIR}/usr/lib/qt/plugins
-}
-
-phonon-devel_package() {
- depends="qt-devel ${sourcepkg}-${version}_${revision}"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/cmake
- vmove usr/lib/pkgconfig
- vmove usr/share/phonon
- }
-}
+replaces="phonon-devel>=0"
From f368a1d542d3169f644ba5fdcfc31d0662d28099 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Tue, 17 Sep 2019 14:57:21 +0200
Subject: [PATCH 3/6] luxmark: remove
---
srcpkgs/luxmark/INSTALL.msg | 1 +
srcpkgs/luxmark/template | 23 +++--------------------
srcpkgs/luxmark/update | 2 --
3 files changed, 4 insertions(+), 22 deletions(-)
create mode 100644 srcpkgs/luxmark/INSTALL.msg
delete mode 100644 srcpkgs/luxmark/update
diff --git a/srcpkgs/luxmark/INSTALL.msg b/srcpkgs/luxmark/INSTALL.msg
new file mode 100644
index 00000000000..70228207809
--- /dev/null
+++ b/srcpkgs/luxmark/INSTALL.msg
@@ -0,0 +1 @@
+luxmark is no longer provided by Void Linux, and will be fully removed from the repos on 2019-12-17
diff --git a/srcpkgs/luxmark/template b/srcpkgs/luxmark/template
index 588f76046fc..f2524539a36 100644
--- a/srcpkgs/luxmark/template
+++ b/srcpkgs/luxmark/template
@@ -1,26 +1,9 @@
# Template file for 'luxmark'
pkgname=luxmark
version=3.1
-revision=7
-build_style=cmake
-makedepends="openimageio-devel tiff-devel libpng-devel libgomp-devel
- libopenexr-devel MesaLib-devel ocl-icd-devel opencl-headers boost-devel
- python-devel luxrays-devel glew-devel libfreeglut-devel qt-devel opencl-clhpp"
-short_desc="OpenCL benchmark based on LuxCore"
+revision=8
+build_style=meta
+short_desc="OpenCL benchmark based on LuxCore (removed package)"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3"
homepage="http://www.luxrender.net/wiki/LuxMark"
-distfiles="https://bitbucket.org/luxrender/luxmark/get/${pkgname}_v${version}.tar.gz"
-checksum=175cc38f8a3cb73cf2ef25d6e99981456d66e1f9c7fb362522e7e58319c026e6
-
-configure_args=" -DCMAKE_SKIP_RPATH=ON"
-
-post_extract() {
- mv $XBPS_BUILDDIR/luxrender-luxmark* $wrksrc
-}
-
-do_install() {
- vbin build/bin/luxmark
- vmkdir usr/share/luxmark
- vcopy scenes usr/share/luxmark
-}
diff --git a/srcpkgs/luxmark/update b/srcpkgs/luxmark/update
deleted file mode 100644
index 24c7a3b659e..00000000000
--- a/srcpkgs/luxmark/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://bitbucket.org/api/1.0/repositories/luxrender/luxmark/tags"
-pattern='luxmark_v\K([\d.]+)(?=")'
From 64a081c826ad4472bbef6f58e01891d07c44a29d Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Tue, 17 Sep 2019 14:59:48 +0200
Subject: [PATCH 4/6] qucs: remove
---
srcpkgs/qucs/INSTALL.msg | 1 +
.../patches/qucsator-fix-list-traversion.patch | 17 -----------------
srcpkgs/qucs/template | 12 +++---------
3 files changed, 4 insertions(+), 26 deletions(-)
create mode 100644 srcpkgs/qucs/INSTALL.msg
delete mode 100644 srcpkgs/qucs/patches/qucsator-fix-list-traversion.patch
diff --git a/srcpkgs/qucs/INSTALL.msg b/srcpkgs/qucs/INSTALL.msg
new file mode 100644
index 00000000000..b35fd8aa61a
--- /dev/null
+++ b/srcpkgs/qucs/INSTALL.msg
@@ -0,0 +1 @@
+qucs is no longer provided by Void Linux, and will be fully removed from the repos on 2019-12-17
diff --git a/srcpkgs/qucs/patches/qucsator-fix-list-traversion.patch b/srcpkgs/qucs/patches/qucsator-fix-list-traversion.patch
deleted file mode 100644
index c22a608adc0..00000000000
--- a/srcpkgs/qucs/patches/qucsator-fix-list-traversion.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- qucs-core/src/net.cpp.org 2017-09-13 20:47:24.863069583 +0200
-+++ qucs-core/src/net.cpp 2017-09-10 00:16:48.863636748 +0200
-@@ -350,7 +350,13 @@
- void net::sortChildAnalyses (analysis * parent) {
- ptrlist<analysis> * alist = parent->getAnalysis ();
- if (alist != nullptr) {
-- for (auto *a: *alist) {
-+
-+ for (auto it = alist->begin(); it != alist->end(); /* empty */) {
-+ // Copy the value of the element (a pointer), and advance the
-+ // iterator prior to manipulating the list.
-+ analysis *a = *it;
-+ ++it;
-+
- if (a->getType () == ANALYSIS_DC
- || containsAnalysis (a, ANALYSIS_DC)) {
- parent->delAnalysis (a);
diff --git a/srcpkgs/qucs/template b/srcpkgs/qucs/template
index 4c18a3258c3..0eb22b505b9 100644
--- a/srcpkgs/qucs/template
+++ b/srcpkgs/qucs/template
@@ -1,15 +1,9 @@
# Template file for 'qucs'
pkgname=qucs
version=0.0.19
-revision=2
-build_style=gnu-configure
-configure_args="--disable-doc"
-hostmakedepends="ADMS-qucs gperf qt-devel"
-makedepends="qt-devel"
-short_desc="Quite Universal Circuit Simulator"
+revision=3
+build_style=meta
+short_desc="Quite Universal Circuit Simulator (removed package)"
maintainer="Martijn van Buul <martijn.van.buul@gmail.com>"
license="GPL-2"
homepage="http://qucs.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${version}/${pkgname}-${version}.tar.gz"
-checksum="45c6434fde24c533e63550675ac21cdbd3cc6cbba29b82a1dc3f36e7dd4b3b3e"
-nocross="yes" # seems to compile all the way, but seems to link against the wrong libX11 (at least)
From d778f66c9132788a7c57464afbe1d7b13107072c Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Tue, 17 Sep 2019 15:05:03 +0200
Subject: [PATCH 5/6] automoc4: remove
---
srcpkgs/automoc4/INSTALL.msg | 1 +
srcpkgs/automoc4/template | 19 +++----------------
2 files changed, 4 insertions(+), 16 deletions(-)
create mode 100644 srcpkgs/automoc4/INSTALL.msg
diff --git a/srcpkgs/automoc4/INSTALL.msg b/srcpkgs/automoc4/INSTALL.msg
new file mode 100644
index 00000000000..779b8bcb9b2
--- /dev/null
+++ b/srcpkgs/automoc4/INSTALL.msg
@@ -0,0 +1 @@
+automoc4 is no longer provided by Void Linux, and will be fully removed from the repos on 2019-12-17
diff --git a/srcpkgs/automoc4/template b/srcpkgs/automoc4/template
index 3b04eb2589c..41197be45d5 100644
--- a/srcpkgs/automoc4/template
+++ b/srcpkgs/automoc4/template
@@ -1,22 +1,9 @@
# Template file for 'automoc4'
pkgname=automoc4
version=0.9.88
-revision=4
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="qt-devel"
-short_desc="Automatic moc for Qt 4 packages"
+revision=5
+build_style=meta
+short_desc="Automatic moc for Qt 4 packages (removed package)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-2-Clause"
homepage="http://techbase.kde.org/Development/Tools/Automoc4"
-distfiles="${KDE_SITE}/automoc4/${version}/automoc4-${version}.tar.bz2"
-checksum=234116f4c05ae21d828594d652b4c4a052ef75727e2d8a4f3a4fb605de9e4c49
-
-if [ -n "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt-qmake qt-host-tools"
-fi
-
-post_install() {
- sed -n '/Copyright/,/SUCH\./p' kde4automoc.cpp > LICENSE
- vlicense LICENSE
-}
From e09945ea283f24b6ab8a48763546f25839c27d57 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Tue, 17 Sep 2019 15:09:43 +0200
Subject: [PATCH 6/6] avogadro: remove
---
common/shlibs | 2 --
srcpkgs/avogadro-devel | 1 -
srcpkgs/avogadro/INSTALL.msg | 1 +
srcpkgs/avogadro/template | 35 ++++-------------------------------
4 files changed, 5 insertions(+), 34 deletions(-)
delete mode 120000 srcpkgs/avogadro-devel
create mode 100644 srcpkgs/avogadro/INSTALL.msg
diff --git a/common/shlibs b/common/shlibs
index bc6b78029e9..dd76aa0f6e8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2609,8 +2609,6 @@ libmono-btls-shared.so mono-5.2.0.215_1
libxcb-xrm.so.0 xcb-util-xrm-1.0_1
libinchi.so.0 openbabel-2.3.2_1
libopenbabel.so.5 openbabel-2.4.1_1
-libavogadro.so.1 avogadro-1.2.0_1
-libavogadro_OpenQube.so.0 avogadro-1.2.0_1
libcourier-unicode.so.4 courier-unicode-2.0_1
libzstd.so.1 libzstd-1.0.0_1
libudis86.so.0 udis86-1.7.2_4
diff --git a/srcpkgs/avogadro-devel b/srcpkgs/avogadro-devel
deleted file mode 120000
index 9ed7d75d9d2..00000000000
--- a/srcpkgs/avogadro-devel
+++ /dev/null
@@ -1 +0,0 @@
-avogadro
\ No newline at end of file
diff --git a/srcpkgs/avogadro/INSTALL.msg b/srcpkgs/avogadro/INSTALL.msg
new file mode 100644
index 00000000000..3ff9aea1379
--- /dev/null
+++ b/srcpkgs/avogadro/INSTALL.msg
@@ -0,0 +1 @@
+avogadro is no longer provided by Void Linux, and will be fully removed from the repos on 2019-12-17
diff --git a/srcpkgs/avogadro/template b/srcpkgs/avogadro/template
index 03b886f1e0d..b3601609837 100644
--- a/srcpkgs/avogadro/template
+++ b/srcpkgs/avogadro/template
@@ -1,37 +1,10 @@
# Template file for 'avogadro'
pkgname=avogadro
version=1.2.0
-revision=8
-build_style=cmake
-configure_args="-DENABLE_TESTING:BOOL=OFF"
-hostmakedepends="pkg-config doxygen"
-makedepends="openbabel-devel qt-devel glew-devel zlib-devel boost-devel
- python-devel hdf5-devel eigen3.2"
-short_desc="An intuitive molecular editor and visualization tool"
+revision=9
+build_style=meta
+short_desc="An intuitive molecular editor and visualization tool (removed package)"
maintainer="Diogo Leal <diogo@diogoleal.com>"
license="GPL-2"
homepage="http://avogadro.cc"
-distfiles="https://github.com/cryos/avogadro/archive/${version}.tar.gz"
-checksum=6453e36e8ae3e61655cbe062df6d6fa6b2409122c7b5abc0a6f1d410a181640b
-
-pre_build() {
- sed -i 's|_BSD_SOURCE|_DEFAULT_SOURCE|g' CMakeLists.txt
-}
-post_install() {
- rm -rf ${DESTDIR}/usr/features
-}
-
-avogadro-devel_package() {
- depends="${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/*.a
- vmove usr/lib/*.so
- vmove usr/lib/cmake
- vmove usr/lib/pkgconfig
- vmove usr/lib/avogadro/*.cmake
- subver=${version%.*}
- vmove usr/lib/avogadro/${subver%.*}_${subver#*.}/*cmake
- }
-}
+replaces="avogadro-devel>=0"
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [WIP] qt: remove
2019-09-17 12:40 [PR PATCH] qt-webkit: remove voidlinux-github
` (7 preceding siblings ...)
2019-09-17 13:11 ` voidlinux-github
@ 2019-09-17 16:38 ` voidlinux-github
2021-01-26 4:07 ` ericonr
2021-01-31 17:15 ` [PR PATCH] [Closed]: " Johnnynator
10 siblings, 0 replies; 12+ messages in thread
From: voidlinux-github @ 2019-09-17 16:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 187 bytes --]
New comment by Chocimier on void-packages repository
https://github.com/void-linux/void-packages/pull/14520#issuecomment-532301033
Comment:
Let's not do it with empty packages, please.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [WIP] qt: remove
2019-09-17 12:40 [PR PATCH] qt-webkit: remove voidlinux-github
` (8 preceding siblings ...)
2019-09-17 16:38 ` voidlinux-github
@ 2021-01-26 4:07 ` ericonr
2021-01-31 17:15 ` [PR PATCH] [Closed]: " Johnnynator
10 siblings, 0 replies; 12+ messages in thread
From: ericonr @ 2021-01-26 4:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 200 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/14520#issuecomment-767282995
Comment:
We should be able to do this with `removed-packages` now :D
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Closed]: [WIP] qt: remove
2019-09-17 12:40 [PR PATCH] qt-webkit: remove voidlinux-github
` (9 preceding siblings ...)
2021-01-26 4:07 ` ericonr
@ 2021-01-31 17:15 ` Johnnynator
10 siblings, 0 replies; 12+ messages in thread
From: Johnnynator @ 2021-01-31 17:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 514 bytes --]
There's a closed pull request on the void-packages repository
[WIP] qt: remove
https://github.com/void-linux/void-packages/pull/14520
Description:
there are also a few python*-PyQt4-* packages in the binary repos that have to be removed.
And python3-pyside*
qucs: no eta for qt5 support
luxmark: has alpha release with qt5 support https://github.com/LuxCoreRender/LuxMark/releases @thypon ?
avogadro: avogadro2 seems to be in development https://github.com/openchemistry/avogadrolibs
depends on #14521
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2021-01-31 17:15 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-17 12:40 [PR PATCH] qt-webkit: remove voidlinux-github
2019-09-17 12:41 ` [PR PATCH] [Updated] " voidlinux-github
2019-09-17 12:41 ` voidlinux-github
2019-09-17 12:44 ` [PR PATCH] [Updated] [WIP] " voidlinux-github
2019-09-17 12:44 ` voidlinux-github
2019-09-17 12:59 ` [PR PATCH] [Updated] [WIP] qt: remove voidlinux-github
2019-09-17 12:59 ` voidlinux-github
2019-09-17 13:11 ` voidlinux-github
2019-09-17 13:11 ` voidlinux-github
2019-09-17 16:38 ` voidlinux-github
2021-01-26 4:07 ` ericonr
2021-01-31 17:15 ` [PR PATCH] [Closed]: " Johnnynator
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).