Skip to content
Snippets Groups Projects
Commit 208f8a60 authored by leso-kn's avatar leso-kn Committed by Celeste
Browse files

testing/compiz: rebuild against abseil-cpp 20240722.0

parent 27705b65
No related branches found
No related tags found
1 merge request!75638testing/compiz: rebuild against abseil-cpp 20240722.0
Pipeline #274605 skipped
# Maintainer: leso-kn <info@lesosoftware.com>
pkgname=compiz
pkgver=0.9.14.2
pkgrel=6
pkgrel=7
pkgdesc="OpenGL window and compositing manager"
url="http://www.compiz.org/"
arch="all"
......@@ -57,10 +57,13 @@ license=MIT
source="$pkgname-$pkgver.tar.xz::https://launchpad.net/compiz/${pkgver%.*}/$pkgver/+download/compiz-$pkgver.tar.xz
basename.patch
boost.patch
glibmm.patch
gtest.patch
libgen.patch
opengl.patch
protobuf.patch
python-3.12.patch
soname.patch
startup-notification-long.patch
"
......@@ -99,9 +102,12 @@ sha512sums="
6d064c65be2af5a9676021d35ade64d262f1ddff0e974bd711805b6975d99697bb188f4a13d919b6f0f26a49544305d397d6c74e790b7672caeffc38f74ab145 compiz-0.9.14.2.tar.xz
2d749f3e384e43454c7c9f4cf16c5289905142d5b14ced2f7a8e173a282e7a4b49e32c106d34d77f9c201f81dfb0bb92090680d9c5250f3571e136b28626c940 basename.patch
669c32ad7e4428dbbc20bcc8f99764f2c0a28b0641b094fa89abcdf760df82d3fddaf1ac6b0596d0a80c1fe81e641c0ad64b550b93a6dfdf7f4759d687840a8f boost.patch
2bbc6456deb85474416049eed194d5df7ec6c445f61c8f691f05f86cfee761cb634011fa658f2cd04c6740fea00400d536437bc7f210730f6651c490e96cb6c9 gtest.patch
236f0370ecd0b9c64009a9be1c8e52e2abb873c712d15b03ce54a2a11b26d2e170deb43c89d994ab3a98ba232fbc173ee2239e0c27ce5d7ae822c4a81eed9915 glibmm.patch
702c432e0e2f0634571012d40e6f82994be6bf9dc7e51b7ccd3c30316dc2c0aaf61b22cf1a8e539c48478f25b382bb2a551ca3036b1622873e45e93a03a57545 gtest.patch
1b3ada1f7fe818cadff8729a3778f161776be4641e1bf36a2ab185921fbcff2e64b9a1d2576441913c7561e1d327612ebdd4a20fde9941a57b3f32e7084f444c libgen.patch
525cec925b490d567e2a29ef6aef0da6344f8b68a682a82d2dff9087c53ece5a901fe0b3fa87120babdbba368b7b46208f872cbea02b6fea93e55700604b1ff7 opengl.patch
9dd0d4c2361fd56645d2f7b634dee32f1d44a67d36b53e550108acc78a8400bfd3c57132a8a029e9884b9f05cdd3a7533c65355d0a3dd80564544931eaced258 protobuf.patch
065b5363c6df39de1074e1dc42ca26e49641b2ef507ff64e73dfcf3dcdf7be1dc8cc149769239b002f456a743787244b33e4c6fa8ed5d32a562533ba8d84810d python-3.12.patch
5439d2abfb5320ab1828f21aee85df896c0ed3f63278d3d16527e62915be677c90d01601adc29bd5aedf4b43f196de1b9616e9fa518a51708236f438b2dee20b soname.patch
2258ab2cf9cea0f3b16c0054b5471e89c11eb75b2dc337e4a2ad63d443435668f383e89e08903085ffc3de78816c41e1d3104e987d792fdf801be85e779faac3 startup-notification-long.patch
"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fbb7e3e..4eafefd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -126,10 +126,12 @@ set (COMPIZ_REQUIRES
libxslt
glib-2.0
gio-2.0
- glibmm-2.4
+ glibmm-2.68
"libstartup-notification-1.0 >= 0.7"
)
+set (CMAKE_CXX_STANDARD 17)
+
set (DECORATION_REQUIRES "xrender >= 0.9.3")
compiz_pkg_check_modules (COMPIZ REQUIRED ${COMPIZ_REQUIRES})
diff --git a/plugins/decor/src/clip-groups/CMakeLists.txt b/plugins/decor/src/clip-groups/CMakeLists.txt
index 0c267d9..4a97cd2 100644
--- a/plugins/decor/src/clip-groups/CMakeLists.txt
+++ b/plugins/decor/src/clip-groups/CMakeLists.txt
@@ -1,9 +1,11 @@
pkg_check_modules (
GLIBMM
REQUIRED
- glibmm-2.4 glib-2.0
+ glibmm-2.68 glib-2.0
)
+set (CMAKE_CXX_STANDARD 17)
+
INCLUDE_DIRECTORIES (
${CMAKE_CURRENT_SOURCE_DIR}/include
${CMAKE_CURRENT_SOURCE_DIR}/src
diff --git a/plugins/decor/src/pixmap-requests/CMakeLists.txt b/plugins/decor/src/pixmap-requests/CMakeLists.txt
index 0d0db14..59600c9 100644
--- a/plugins/decor/src/pixmap-requests/CMakeLists.txt
+++ b/plugins/decor/src/pixmap-requests/CMakeLists.txt
@@ -1,9 +1,11 @@
pkg_check_modules (
GLIBMM
REQUIRED
- glibmm-2.4 glib-2.0
+ glibmm-2.68 glib-2.0
)
+set (CMAKE_CXX_STANDARD 17)
+
INCLUDE_DIRECTORIES (
${CMAKE_CURRENT_SOURCE_DIR}/include
${CMAKE_CURRENT_SOURCE_DIR}/src
diff --git a/plugins/place/src/constrain-to-workarea/CMakeLists.txt b/plugins/place/src/constrain-to-workarea/CMakeLists.txt
index 80c9c4b..70e16cf 100644
--- a/plugins/place/src/constrain-to-workarea/CMakeLists.txt
+++ b/plugins/place/src/constrain-to-workarea/CMakeLists.txt
@@ -1,9 +1,11 @@
pkg_check_modules (
GLIBMM
REQUIRED
- glibmm-2.4 glib-2.0
+ glibmm-2.68 glib-2.0
)
+set (CMAKE_CXX_STANDARD 17)
+
INCLUDE_DIRECTORIES (
${CMAKE_CURRENT_SOURCE_DIR}/include
${CMAKE_CURRENT_SOURCE_DIR}/src
diff --git a/plugins/place/src/screen-size-change/CMakeLists.txt b/plugins/place/src/screen-size-change/CMakeLists.txt
index 6f52e49..44c53ce 100644
--- a/plugins/place/src/screen-size-change/CMakeLists.txt
+++ b/plugins/place/src/screen-size-change/CMakeLists.txt
@@ -1,9 +1,11 @@
pkg_check_modules (
GLIBMM
REQUIRED
- glibmm-2.4 glib-2.0
+ glibmm-2.68 glib-2.0
)
+set (CMAKE_CXX_STANDARD 17)
+
INCLUDE_DIRECTORIES (
${CMAKE_CURRENT_SOURCE_DIR}/include
${CMAKE_CURRENT_SOURCE_DIR}/src
diff --git a/plugins/place/src/smart/CMakeLists.txt b/plugins/place/src/smart/CMakeLists.txt
index 24e66fd..8cfbcc7 100644
--- a/plugins/place/src/smart/CMakeLists.txt
+++ b/plugins/place/src/smart/CMakeLists.txt
@@ -1,9 +1,11 @@
pkg_check_modules (
GLIBMM
REQUIRED
- glibmm-2.4 glib-2.0
+ glibmm-2.68 glib-2.0
)
+set (CMAKE_CXX_STANDARD 17)
+
INCLUDE_DIRECTORIES (
${CMAKE_CURRENT_SOURCE_DIR}/include
${CMAKE_CURRENT_SOURCE_DIR}/src
diff --git a/src/point/CMakeLists.txt b/src/point/CMakeLists.txt
index 207b2e5..072e230 100644
--- a/src/point/CMakeLists.txt
+++ b/src/point/CMakeLists.txt
@@ -1,9 +1,11 @@
pkg_check_modules (
GLIBMM
REQUIRED
- glibmm-2.4 glib-2.0
+ glibmm-2.68 glib-2.0
)
+set (CMAKE_CXX_STANDARD 17)
+
INCLUDE_DIRECTORIES (
${compiz_SOURCE_DIR}/include
${Boost_INCLUDE_DIRS}
diff --git a/src/rect/CMakeLists.txt b/src/rect/CMakeLists.txt
index 336235b..76246a4 100644
--- a/src/rect/CMakeLists.txt
+++ b/src/rect/CMakeLists.txt
@@ -1,9 +1,11 @@
pkg_check_modules (
GLIBMM
REQUIRED
- glibmm-2.4 glib-2.0
+ glibmm-2.68 glib-2.0
)
+set (CMAKE_CXX_STANDARD 17)
+
INCLUDE_DIRECTORIES (
${CMAKE_CURRENT_SOURCE_DIR}/include
${CMAKE_CURRENT_SOURCE_DIR}/src
diff --git a/src/timer/CMakeLists.txt b/src/timer/CMakeLists.txt
index 03bb9b6..f3b98dc 100644
--- a/src/timer/CMakeLists.txt
+++ b/src/timer/CMakeLists.txt
@@ -1,9 +1,11 @@
pkg_check_modules(
GLIBMM
REQUIRED
- glibmm-2.4
+ glibmm-2.68
)
+set (CMAKE_CXX_STANDARD 17)
+
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}/include
${CMAKE_CURRENT_SOURCE_DIR}/src
diff --git a/src/window/constrainment/CMakeLists.txt b/src/window/constrainment/CMakeLists.txt
index 20a0e95..3dfe69b 100644
--- a/src/window/constrainment/CMakeLists.txt
+++ b/src/window/constrainment/CMakeLists.txt
@@ -1,9 +1,11 @@
pkg_check_modules (
GLIBMM
REQUIRED
- glibmm-2.4 glib-2.0
+ glibmm-2.68 glib-2.0
)
+set (CMAKE_CXX_STANDARD 17)
+
INCLUDE_DIRECTORIES (
${CMAKE_CURRENT_SOURCE_DIR}/include
${CMAKE_CURRENT_SOURCE_DIR}/src
diff --git a/src/window/extents/CMakeLists.txt b/src/window/extents/CMakeLists.txt
index 9e26a7b..5e28664 100644
--- a/src/window/extents/CMakeLists.txt
+++ b/src/window/extents/CMakeLists.txt
@@ -1,9 +1,11 @@
pkg_check_modules (
GLIBMM
REQUIRED
- glibmm-2.4 glib-2.0
+ glibmm-2.68 glib-2.0
)
+set (CMAKE_CXX_STANDARD 17)
+
INCLUDE_DIRECTORIES (
${CMAKE_CURRENT_SOURCE_DIR}/include
${CMAKE_CURRENT_SOURCE_DIR}/src
diff --git a/src/window/geometry-saver/CMakeLists.txt b/src/window/geometry-saver/CMakeLists.txt
index 6d5e12c..3dedb42 100644
--- a/src/window/geometry-saver/CMakeLists.txt
+++ b/src/window/geometry-saver/CMakeLists.txt
@@ -1,9 +1,11 @@
pkg_check_modules (
GLIBMM
REQUIRED
- glibmm-2.4 glib-2.0
+ glibmm-2.68 glib-2.0
)
+set (CMAKE_CXX_STANDARD 17)
+
INCLUDE_DIRECTORIES (
${CMAKE_CURRENT_SOURCE_DIR}/include
${CMAKE_CURRENT_SOURCE_DIR}/src
diff --git a/src/window/geometry/CMakeLists.txt b/src/window/geometry/CMakeLists.txt
index 24bdb21..cda3798 100644
--- a/src/window/geometry/CMakeLists.txt
+++ b/src/window/geometry/CMakeLists.txt
@@ -1,9 +1,11 @@
pkg_check_modules (
GLIBMM
REQUIRED
- glibmm-2.4 glib-2.0
+ glibmm-2.68 glib-2.0
)
+set (CMAKE_CXX_STANDARD 17)
+
INCLUDE_DIRECTORIES (
${CMAKE_CURRENT_SOURCE_DIR}/include
${CMAKE_CURRENT_SOURCE_DIR}/src
diff --git a/tests/integration/glib/CMakeLists.txt b/tests/integration/glib/CMakeLists.txt
index 48d4e12..80a5fda 100644
--- a/tests/integration/glib/CMakeLists.txt
+++ b/tests/integration/glib/CMakeLists.txt
@@ -1,4 +1,6 @@
-pkg_check_modules (COMPIZ_GLIB_INTEGRATION_TEST glibmm-2.4)
+pkg_check_modules (COMPIZ_GLIB_INTEGRATION_TEST glibmm-2.68)
+
+set (CMAKE_CXX_STANDARD 17)
if (COMPIZ_GLIB_INTEGRATION_TEST_FOUND)
diff --git a/src/timer/include/core/timer.h b/src/timer/include/core/timer.h
index c4edb12..fbc1cd6 100644
--- a/src/timer/include/core/timer.h
+++ b/src/timer/include/core/timer.h
@@ -28,6 +28,8 @@
#include <boost/function.hpp>
#include <sys/time.h>
+
+#undef PREFIX
#include <glibmm/main.h>
class CompTimeoutSource;
diff --git a/src/eventsource.cpp b/src/eventsource.cpp
index 1892cb4..4a7c4b0 100644
--- a/src/eventsource.cpp
+++ b/src/eventsource.cpp
@@ -45,7 +45,7 @@ CompEventSource::CompEventSource (Display *dpy, int fd) :
mConnectionFD (fd)
{
mPollFD.set_fd (mConnectionFD);
- mPollFD.set_events (Glib::IO_IN);
+ mPollFD.set_events (Glib::IOCondition::IO_IN);
set_priority (G_PRIORITY_DEFAULT);
add_poll (mPollFD);
@@ -75,7 +75,7 @@ CompEventSource::prepare (int &timeout)
bool
CompEventSource::check ()
{
- if (mPollFD.get_revents () & Glib::IO_IN)
+ if ((mPollFD.get_revents () & Glib::IOCondition::IO_IN) == Glib::IOCondition::IO_IN)
return XPending (mDpy);
return false;
diff --git a/src/screen.cpp b/src/screen.cpp
index 89832e0..1476d69 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -312,15 +312,15 @@ cps::EventManager::addWatchFd (int fd,
memset (&gEvents, 0, sizeof (Glib::IOCondition));
if (events & POLLIN)
- gEvents |= Glib::IO_IN;
+ gEvents |= Glib::IOCondition::IO_IN;
if (events & POLLOUT)
- gEvents |= Glib::IO_OUT;
+ gEvents |= Glib::IOCondition::IO_OUT;
if (events & POLLPRI)
- gEvents |= Glib::IO_PRI;
+ gEvents |= Glib::IOCondition::IO_PRI;
if (events & POLLERR)
- gEvents |= Glib::IO_ERR;
+ gEvents |= Glib::IOCondition::IO_ERR;
if (events & POLLHUP)
- gEvents |= Glib::IO_HUP;
+ gEvents |= Glib::IOCondition::IO_HUP;
Glib::RefPtr<CompWatchFd> watchFd = CompWatchFd::create (fd, gEvents, callBack);
@@ -393,17 +393,17 @@ CompWatchFd::internalCallback (Glib::IOCondition events)
{
short int revents = 0;
- if (events & Glib::IO_IN)
+ if ((events & Glib::IOCondition::IO_IN) == Glib::IOCondition::IO_IN)
revents |= POLLIN;
- if (events & Glib::IO_OUT)
+ if ((events & Glib::IOCondition::IO_OUT) == Glib::IOCondition::IO_OUT)
revents |= POLLOUT;
- if (events & Glib::IO_PRI)
+ if ((events & Glib::IOCondition::IO_PRI) == Glib::IOCondition::IO_PRI)
revents |= POLLPRI;
- if (events & Glib::IO_ERR)
+ if ((events & Glib::IOCondition::IO_ERR) == Glib::IOCondition::IO_ERR)
revents |= POLLERR;
- if (events & Glib::IO_HUP)
+ if ((events & Glib::IOCondition::IO_HUP) == Glib::IOCondition::IO_HUP)
revents |= POLLHUP;
- if (events & Glib::IO_NVAL)
+ if ((events & Glib::IOCondition::IO_NVAL) == Glib::IOCondition::IO_NVAL)
return false;
mExecuting = true;
diff --git a/tests/integration/glib/glib_integration_test.cpp b/tests/integration/glib/glib_integration_test.cpp
index 4298545..29ede50 100644
--- a/tests/integration/glib/glib_integration_test.cpp
+++ b/tests/integration/glib/glib_integration_test.cpp
@@ -139,7 +139,7 @@ TEST_F (GLibSourceDestroyIntegration, EventSourceGSourceDestroy)
TEST_F (GLibSourceDestroyIntegration, FdSourceGSourceDestroy)
{
- Glib::IOCondition iocond = Glib::IO_IN;
+ Glib::IOCondition iocond = Glib::IOCondition::IO_IN;
int fd = 0;
FdWatchCallBack cb;
Glib::RefPtr<StubWatchFd> sts(new StubWatchFd (&die, fd, iocond, cb));
diff --git a/src/eventsource.cpp b/src/eventsource.cpp
index 6898d74..440d66c 100644
--- a/src/eventsource.cpp
+++ b/src/eventsource.cpp
@@ -34,7 +34,7 @@ CompEventSource::create ()
}
sigc::connection
-CompEventSource::connect (const sigc::slot <bool> &slot)
+CompEventSource::connect (const sigc::slot <bool()> &slot)
{
return connect_generic (slot);
}
@@ -51,7 +51,7 @@ CompEventSource::CompEventSource (Display *dpy, int fd) :
add_poll (mPollFD);
set_can_recurse (true);
- connect (sigc::mem_fun <bool, CompEventSource> (this, &CompEventSource::callback));
+ connect (sigc::mem_fun <bool, CompEventSource> (*this, &CompEventSource::callback));
}
CompEventSource::~CompEventSource ()
@@ -84,5 +84,5 @@ CompEventSource::check ()
bool
CompEventSource::dispatch (sigc::slot_base *slot)
{
- return (*static_cast <sigc::slot <bool> *> (slot)) ();
+ return (*static_cast <sigc::slot <bool()> *> (slot)) ();
}
diff --git a/src/privateeventsource.h b/src/privateeventsource.h
index ed9a0c1..12c551c 100644
--- a/src/privateeventsource.h
+++ b/src/privateeventsource.h
@@ -39,7 +39,7 @@ class CompEventSource:
static Glib::RefPtr<CompEventSource> create ();
- sigc::connection connect (const sigc::slot <bool> &slot);
+ sigc::connection connect (const sigc::slot <bool()> &slot);
protected:
diff --git a/src/screen.cpp b/src/screen.cpp
index 556ae56..1faf200 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -278,8 +278,7 @@ CompWatchFd::CompWatchFd (int fd,
mForceFail (false),
mExecuting (false)
{
- connect (sigc::mem_fun <Glib::IOCondition, bool>
- (this, &CompWatchFd::internalCallback));
+ connect (sigc::mem_fun(*this, &CompWatchFd::internalCallback));
}
CompWatchFd::~CompWatchFd ()
diff --git a/src/timer/src/privatetimeoutsource.h b/src/timer/src/privatetimeoutsource.h
index 5e18d08..dab743c 100644
--- a/src/timer/src/privatetimeoutsource.h
+++ b/src/timer/src/privatetimeoutsource.h
@@ -38,7 +38,7 @@ class CompTimeoutSource :
virtual ~CompTimeoutSource ();
static Glib::RefPtr<CompTimeoutSource> create (Glib::RefPtr <Glib::MainContext> &ctx);
- sigc::connection connect (const sigc::slot <bool> &slot);
+ sigc::connection connect (const sigc::slot <bool()> &slot);
protected:
diff --git a/src/timer/src/timer.cpp b/src/timer/src/timer.cpp
index 5288b81..fe778ad 100644
--- a/src/timer/src/timer.cpp
+++ b/src/timer/src/timer.cpp
@@ -56,7 +56,7 @@ CompTimeoutSource::CompTimeoutSource (Glib::RefPtr <Glib::MainContext> &ctx) :
set_priority (G_PRIORITY_DEFAULT);
attach (ctx);
- connect (sigc::mem_fun <bool, CompTimeoutSource> (this, &CompTimeoutSource::callback));
+ connect (sigc::mem_fun <bool, CompTimeoutSource> (*this, &CompTimeoutSource::callback));
}
CompTimeoutSource::~CompTimeoutSource ()
@@ -64,7 +64,7 @@ CompTimeoutSource::~CompTimeoutSource ()
}
sigc::connection
-CompTimeoutSource::connect (const sigc::slot <bool> &slot)
+CompTimeoutSource::connect (const sigc::slot <bool()> &slot)
{
return connect_generic (slot);
}
@@ -130,7 +130,7 @@ CompTimeoutSource::check ()
bool
CompTimeoutSource::dispatch (sigc::slot_base *slot)
{
- (*static_cast <sigc::slot <bool> *> (slot)) ();
+ (*static_cast <sigc::slot <bool()> *> (slot)) ();
return true;
}
diff --git a/compizconfig/gsettings/mocks/CMakeLists.txt b/compizconfig/gsettings/mocks/CMakeLists.txt
index 14fe51e..d105bb1 100644
index 17fe51e..d105bb1 100644
--- a/compizconfig/gsettings/mocks/CMakeLists.txt
+++ b/compizconfig/gsettings/mocks/CMakeLists.txt
@@ -8,7 +8,7 @@ if (GLIB_FOUND)
......@@ -7,7 +7,7 @@ index 14fe51e..d105bb1 100644
${GLIB_INCLUDE_DIRS})
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
add_library (compizconfig_ccs_gsettings_wrapper_mock STATIC
${CMAKE_CURRENT_SOURCE_DIR}/ccs_gsettings_wrapper_mock.cpp
......@@ -20,7 +20,7 @@ index 9a81a5d..2e3bbb0 100644
if (COMPIZCONFIG_TEST_GSETTINGS_FOUND)
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
link_directories (${CMAKE_CURRENT_BINARY_DIR}/../../libcompizconfig/tests)
link_directories (${CMAKE_CURRENT_BINARY_DIR}/../testenvironments)
......@@ -33,7 +33,7 @@ index 683c83f..7778503 100644
link_directories (${CMAKE_CURRENT_BINARY_DIR}/../src/)
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
add_executable (compizconfig_test_ccs_gnome_gsettings_integrated_setting
${CMAKE_CURRENT_SOURCE_DIR}/compizconfig_test_ccs_gnome_gsettings_integrated_setting.cpp)
......@@ -46,7 +46,7 @@ index 30fd552..26fdff1 100644
link_directories (${CMAKE_INSTALL_PREFIX}/lib)
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
add_library (compizconfig_ccs_mock_gnome_integrated_setting_composition
${CMAKE_CURRENT_SOURCE_DIR}/compizconfig_ccs_mock_gnome_integrated_setting_composition.c)
......@@ -59,7 +59,7 @@ index a3a42f9..78446f4 100644
link_directories (${CMAKE_CURRENT_BINARY_DIR}/../src/)
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
add_definitions (-DCONFIGDIR="${COMPIZCONFIG_CONFIG_DIR}")
......@@ -72,7 +72,7 @@ index b567cfc..d06e86b 100644
# Almost everything is a shared library now, so almost everything needs -fPIC
set (COMMON_FLAGS "-fPIC -Wall")
-set (COMMON_CXX_FLAGS "-std=c++11")
+set (COMMON_CXX_FLAGS "-std=c++14")
+set (COMMON_CXX_FLAGS "-std=c++17")
option (COMPIZ_SUBOBJECT_LINKAGE_WARNINGS "Warn about subobject linkage" OFF)
if (NOT COMPIZ_SUBOBJECT_LINKAGE_WARNINGS)
......
diff --git a/compizconfig/compizconfig-python/tests/compiz_config_test.py b/compizconfig/compizconfig-python/tests/compiz_config_test.py
index cb6dc22..7ac40b8 100644
--- a/compizconfig/compizconfig-python/tests/compiz_config_test.py
+++ b/compizconfig/compizconfig-python/tests/compiz_config_test.py
@@ -11,7 +11,7 @@ os.environ["XDG_CONFIG_HOME"] = "compizconfig/libcompizconfig/config"
os.environ["LIBCOMPIZCONFIG_BACKEND_PATH"] = "compizconfig/libcompizconfig/backend/"
os.environ["XDG_DATA_DIRS"] = "generated/"
-sys.path.insert (0, "compizconfig/compizconfig-python/build/lib.%s-%s.%s" % (arch, *sys.version_info[:2]))
+sys.path.insert (0, "compizconfig/compizconfig-python/build/lib.%s-cpython-%s%s" % (arch, *sys.version_info[:2]))
import unittest
import compizconfig
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 997d050..fa1ed8c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -131,7 +131,7 @@ file (STRINGS ${abiversion_h} abiline REGEX "^#define +CORE_ABIVERSION .+$")
string (REGEX REPLACE "#define +CORE_ABIVERSION +" "" abiversion "${abiline}")
set_target_properties (compiz_core PROPERTIES
VERSION ${VERSION}
- SOVERSION "ABI-${abiversion}"
+ SOVERSION "${abiversion}"
)
add_executable (compiz
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment