summaryrefslogtreecommitdiff
path: root/source/kde
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2020-12-14 22:41:16 +0000
committerEric Hameleers <alien@slackware.com>2020-12-15 08:59:50 +0100
commit0dc2fd5cf511a8234b81a1df1444fb2a0a131eaa (patch)
tree9578451e29b487ec00cdd9679e0e6d8aaf2b5d39 /source/kde
parent8e832fbd4b7a5247cf7a23368e2ea308ea4dc739 (diff)
downloadcurrent-0dc2fd5cf511a8234b81a1df1444fb2a0a131eaa.tar.gz
Mon Dec 14 22:41:16 UTC 202020201214224116
ap/pamixer-1.4-x86_64-7.txz: Rebuilt. Recompiled against boost-1.75.0. ap/rpm-4.16.1-x86_64-1.txz: Upgraded. d/strace-5.10-x86_64-1.txz: Upgraded. kde/kig-20.12.0-x86_64-2.txz: Rebuilt. Recompiled against boost-1.75.0. kde/krita-4.4.1-x86_64-2.txz: Rebuilt. Recompiled against boost-1.75.0. l/atkmm-2.28.1-x86_64-1.txz: Upgraded. l/boost-1.75.0-x86_64-1.txz: Upgraded. Shared library .so-version bump. l/cryfs-0.10.2-x86_64-2.txz: Rebuilt. Recompiled against boost-1.75.0. l/fftw-3.3.9-x86_64-1.txz: Upgraded. l/glade3-3.8.6-x86_64-2.txz: Removed. l/gtkmm3-3.24.3-x86_64-1.txz: Upgraded. l/libcap-2.46-x86_64-1.txz: Upgraded. l/mozjs78-78.6.0esr-x86_64-1.txz: Upgraded. l/openexr-2.5.3-x86_64-2.txz: Rebuilt. Recompiled against boost-1.75.0. l/pangomm-2.42.2-x86_64-1.txz: Upgraded. l/rttr-0.9.6-x86_64-2.txz: Rebuilt. Get rid of /usr/doc/index.html (and excessive docs). n/s-nail-14.9.20-x86_64-1.txz: Upgraded. xap/mozilla-firefox-78.6.0esr-x86_64-1.txz: Upgraded. This is a bugfix release. For more information, see: https://www.mozilla.org/en-US/firefox/78.6.0/releasenotes/ xap/xpaint-3.0.3-x86_64-1.txz: Upgraded. xfce/libxfce4ui-4.14.1-x86_64-2.txz: Rebuilt. Recompiled against glade-3.38.2.
Diffstat (limited to 'source/kde')
-rw-r--r--source/kde/kde/build/kig2
-rw-r--r--source/kde/kde/build/krita2
-rw-r--r--source/kde/kde/patch/krita.patch2
-rw-r--r--source/kde/kde/patch/krita/krita.boost_1_75_0.diff13
4 files changed, 17 insertions, 2 deletions
diff --git a/source/kde/kde/build/kig b/source/kde/kde/build/kig
index d00491fd..0cfbf088 100644
--- a/source/kde/kde/build/kig
+++ b/source/kde/kde/build/kig
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/krita b/source/kde/kde/build/krita
index d00491fd..0cfbf088 100644
--- a/source/kde/kde/build/krita
+++ b/source/kde/kde/build/krita
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/patch/krita.patch b/source/kde/kde/patch/krita.patch
new file mode 100644
index 00000000..45232094
--- /dev/null
+++ b/source/kde/kde/patch/krita.patch
@@ -0,0 +1,2 @@
+# Boost 1.75.0 requires C++ 14 standard:
+cat $CWD/patch/krita/krita.boost_1_75_0.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/krita/krita.boost_1_75_0.diff b/source/kde/kde/patch/krita/krita.boost_1_75_0.diff
new file mode 100644
index 00000000..c177274f
--- /dev/null
+++ b/source/kde/kde/patch/krita/krita.boost_1_75_0.diff
@@ -0,0 +1,13 @@
+--- ./CMakeLists.txt.orig 2020-10-28 06:42:28.000000000 -0500
++++ ./CMakeLists.txt 2020-12-14 14:12:57.970780187 -0600
+@@ -568,6 +568,10 @@
+ add_definitions(-DBOOST_ALL_NO_LIB)
+ find_package(Boost 1.55 REQUIRED COMPONENTS system)
+ include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
++if(${Boost_VERSION} VERSION_GREATER_EQUAL "1.75")
++ message(WARNING "Boost 1.75 or higher detected, upgrading to C++14.")
++ set(CMAKE_CXX_STANDARD 14)
++endif()
+ ##
+ ## Test for GNU Scientific Library
+ ##