diff options
| -rw-r--r-- | .SRCINFO | 22 | ||||
| -rw-r--r-- | 0001-reverse-unity-config.patch (renamed from reverse-unity-config.patch) | 0 | ||||
| -rw-r--r-- | 0002-focus-prevention-disable.patch (renamed from focus-prevention-disable.patch) | 0 | ||||
| -rw-r--r-- | 0003-gtk-extents.patch (renamed from gtk-extents.patch) | 0 | ||||
| -rw-r--r-- | 0004-screenshot-launch-fix.patch (renamed from screenshot-launch-fix.patch) | 0 | ||||
| -rw-r--r-- | 0005-no-compile-gschemas.patch (renamed from no-compile-gschemas.patch) | 0 | ||||
| -rw-r--r-- | 0006-Drop-toggle-shaded-since-it-s-no-longer-included-in-.patch | 40 | ||||
| -rw-r--r-- | 0007-64-bit-time-t-compat.patch | 43 | ||||
| -rw-r--r-- | 1001-releasing-package-compiz-version-1-0.9.14.2-22.10.20.patch | 90 | ||||
| -rw-r--r-- | 1002-releasing-package-compiz-version-1-0.9.14.2-22.10.20.patch | 59 | ||||
| -rw-r--r-- | PKGBUILD | 215 |
11 files changed, 336 insertions, 133 deletions
@@ -1,7 +1,7 @@ pkgbase = compiz pkgdesc = Composite manager for Aiglx and Xgl, with plugins and CCSM pkgver = 0.9.14.2 - pkgrel = 5 + pkgrel = 6 url = https://launchpad.net/compiz arch = i686 arch = x86_64 @@ -44,16 +44,24 @@ pkgbase = compiz conflicts = libcompizconfig conflicts = simple-ccsm source = compiz-0.9.14.2.tar.xz::https://launchpad.net/compiz/0.9.14/0.9.14.2/+download/compiz-0.9.14.2.tar.xz - source = focus-prevention-disable.patch - source = gtk-extents.patch - source = reverse-unity-config.patch - source = screenshot-launch-fix.patch - source = no-compile-gschemas.patch + source = 0001-reverse-unity-config.patch + source = 0002-focus-prevention-disable.patch + source = 0003-gtk-extents.patch + source = 0004-screenshot-launch-fix.patch + source = 0005-no-compile-gschemas.patch + source = 0006-Drop-toggle-shaded-since-it-s-no-longer-included-in-.patch + source = 0007-64-bit-time-t-compat.patch + source = 1001-releasing-package-compiz-version-1-0.9.14.2-22.10.20.patch + source = 1002-releasing-package-compiz-version-1-0.9.14.2-22.10.20.patch sha256sums = cfa061e93b032275ff9e7041f582a8f6d5ae271cf8a89e6bc74e3d3635999d3c + sha256sums = 6ec9c04540ca1649c687d9ab2c8311caea7075831e2cffe719ec7958c9ebab7b sha256sums = f4897590b0f677ba34767a29822f8f922a750daf66e8adf47be89f7c2550cf4b sha256sums = 16ddb6311ce42d958505e21ca28faae5deeddce02cb558d55e648380274ba4d9 - sha256sums = 6ec9c04540ca1649c687d9ab2c8311caea7075831e2cffe719ec7958c9ebab7b sha256sums = 89ee91a8ea6b1424ef76661ea9a2db43412366aacddc12d24a7adf5e04bfbc61 sha256sums = 4ab3277da201314b3f65e30128bc30704ddee584fdbbfc8d0d83c7e0de91fa9a + sha256sums = 9b9e92a7174f2255f408d340dcb7b765211777cd92fe9ed17b5888ff13578291 + sha256sums = 90969b7beba107a7146b11c3a60969b62c2be7a3e891d7dee913504ec6de759c + sha256sums = 3c7ed442af8ec99ab521afbd64cb97fc0ae5d2ec6b6506a8e79c7b65fda342c0 + sha256sums = f68b6ada12a720853d6abe04a623448e31bf2dae6c3a66d935c937bcf374cd19 pkgname = compiz diff --git a/reverse-unity-config.patch b/0001-reverse-unity-config.patch index 6828481af835..6828481af835 100644 --- a/reverse-unity-config.patch +++ b/0001-reverse-unity-config.patch diff --git a/focus-prevention-disable.patch b/0002-focus-prevention-disable.patch index df2fcef106db..df2fcef106db 100644 --- a/focus-prevention-disable.patch +++ b/0002-focus-prevention-disable.patch diff --git a/gtk-extents.patch b/0003-gtk-extents.patch index 5c8ec1ec2049..5c8ec1ec2049 100644 --- a/gtk-extents.patch +++ b/0003-gtk-extents.patch diff --git a/screenshot-launch-fix.patch b/0004-screenshot-launch-fix.patch index 8192961bbd33..8192961bbd33 100644 --- a/screenshot-launch-fix.patch +++ b/0004-screenshot-launch-fix.patch diff --git a/no-compile-gschemas.patch b/0005-no-compile-gschemas.patch index 05627a858d2c..05627a858d2c 100644 --- a/no-compile-gschemas.patch +++ b/0005-no-compile-gschemas.patch diff --git a/0006-Drop-toggle-shaded-since-it-s-no-longer-included-in-.patch b/0006-Drop-toggle-shaded-since-it-s-no-longer-included-in-.patch new file mode 100644 index 000000000000..d58598dd0552 --- /dev/null +++ b/0006-Drop-toggle-shaded-since-it-s-no-longer-included-in-.patch @@ -0,0 +1,40 @@ +From 25b6fcf77f1731ac9e0949fafe8da00777e33ebc Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jeremy=20B=C3=ADcha?= <jbicha@ubuntu.com> +Date: Thu, 7 Mar 2024 15:46:39 -0500 +Subject: [PATCH 3/4] Drop toggle-shaded since it's no longer included in + gsettings-desktop-schemas 45 + +--- + gtk/gnome/50-compiz-windows.xml.in | 2 -- + .../compiz-profile-independent-keys.convert | 1 - + 3 files changed, 28 deletions(-) + delete mode 100644 a + +diff --git a/gtk/gnome/50-compiz-windows.xml.in b/gtk/gnome/50-compiz-windows.xml.in +index e947db654..5385ead1a 100644 +--- a/gtk/gnome/50-compiz-windows.xml.in ++++ b/gtk/gnome/50-compiz-windows.xml.in +@@ -11,8 +11,6 @@ + + <KeyListEntry name="unmaximize" _description="Restore window" /> + +- <KeyListEntry name="toggle-shaded" _description="Toggle shaded state" /> +- + <KeyListEntry name="close" _description="Close window" /> + + <KeyListEntry name="minimize" _description="Minimize window" /> +diff --git a/postinst/convert-files/compiz-profile-independent-keys.convert b/postinst/convert-files/compiz-profile-independent-keys.convert +index fdc949e4f..f15c23964 100644 +--- a/postinst/convert-files/compiz-profile-independent-keys.convert ++++ b/postinst/convert-files/compiz-profile-independent-keys.convert +@@ -39,7 +39,6 @@ toggle-fullscreen = /apps/metacity/window_keybindings/toggle_fullscreen + toggle-maximized = /apps/metacity/window_keybindings/toggle_maximized + maximize = /apps/metacity/window_keybindings/maximize + unmaximize = /apps/metacity/window_keybindings/unmaximize +-toggle-shaded = /apps/metacity/window_keybindings/toggle_shaded + close = /apps/metacity/window_keybindings/close + minimize = /apps/metacity/window_keybindings/minimize + begin-move = /apps/metacity/window_keybindings/begin_move +-- +2.45.1 + diff --git a/0007-64-bit-time-t-compat.patch b/0007-64-bit-time-t-compat.patch new file mode 100644 index 000000000000..cee1698cd323 --- /dev/null +++ b/0007-64-bit-time-t-compat.patch @@ -0,0 +1,43 @@ +Description: fix build with _TIME_BITS=64 + The startup-notification API takes a long * where it ought to have always + taken a time_t *. As a consequence, changing the size of time_t makes + callers fail to build. Work around this by safely casting to a long. + This will continue to work on 32-bit systems until 2038, by which time + all the 32-bit systems will be dead or no longer running GUIs or at least + not using libstartup-notification0. +Author: Steve Langasek <steve.langasek@canonical.com> +Forwarded: no +Last-Update: 2024-03-15 + +Index: compiz-0.9.14.2+22.10.20220822/src/screen.cpp +=================================================================== +--- compiz-0.9.14.2+22.10.20220822.orig/src/screen.cpp ++++ compiz-0.9.14.2+22.10.20220822/src/screen.cpp +@@ -2315,19 +2315,22 @@ + bool + cps::StartupSequence::handleStartupSequenceTimeout () + { +- struct timeval now, active; ++ struct timeval now; + double elapsed; + + gettimeofday (&now, NULL); + + foreach (CompStartupSequence *s, startupSequences) + { ++ /* workaround for broken startup-notification api that uses ++ a long where it should have used time_t */ ++ long seconds, useconds; + sn_startup_sequence_get_last_active_time (s->sequence, +- &active.tv_sec, +- &active.tv_usec); ++ &seconds, ++ &useconds); + +- elapsed = ((((double) now.tv_sec - active.tv_sec) * 1000000.0 + +- (now.tv_usec - active.tv_usec))) / 1000.0; ++ elapsed = ((((double) now.tv_sec - seconds) * 1000000.0 + ++ (now.tv_usec - useconds))) / 1000.0; + + if (elapsed > STARTUP_TIMEOUT_DELAY) + sn_startup_sequence_complete (s->sequence); diff --git a/1001-releasing-package-compiz-version-1-0.9.14.2-22.10.20.patch b/1001-releasing-package-compiz-version-1-0.9.14.2-22.10.20.patch new file mode 100644 index 000000000000..66451688fccc --- /dev/null +++ b/1001-releasing-package-compiz-version-1-0.9.14.2-22.10.20.patch @@ -0,0 +1,90 @@ +From de87003c6d3d48f741d7c1478a4855a965f19364 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jeremy=20B=C3=ADcha?= <jeremy.bicha@canonical.com> +Date: Thu, 7 Mar 2024 15:43:50 -0500 +Subject: [PATCH 1/4] releasing package compiz version + 1:0.9.14.2+22.10.20220822-0ubuntu4 + +--- + cmake/CompizCommon.cmake | 1 - + compizconfig/gsettings/mocks/CMakeLists.txt | 1 - + compizconfig/gsettings/tests/CMakeLists.txt | 1 - + compizconfig/integration/gnome/gsettings/tests/CMakeLists.txt | 1 - + compizconfig/integration/gnome/tests/CMakeLists.txt | 1 - + compizconfig/libcompizconfig/tests/CMakeLists.txt | 1 - + 6 files changed, 6 deletions(-) + +diff --git a/cmake/CompizCommon.cmake b/cmake/CompizCommon.cmake +index b567cfca5..8cb572ca5 100644 +--- a/cmake/CompizCommon.cmake ++++ b/cmake/CompizCommon.cmake +@@ -54,7 +54,6 @@ set ( + + # Almost everything is a shared library now, so almost everything needs -fPIC + set (COMMON_FLAGS "-fPIC -Wall") +-set (COMMON_CXX_FLAGS "-std=c++11") + + option (COMPIZ_SUBOBJECT_LINKAGE_WARNINGS "Warn about subobject linkage" OFF) + if (NOT COMPIZ_SUBOBJECT_LINKAGE_WARNINGS) +diff --git a/compizconfig/gsettings/mocks/CMakeLists.txt b/compizconfig/gsettings/mocks/CMakeLists.txt +index 14fe51e3f..5474c7237 100644 +--- a/compizconfig/gsettings/mocks/CMakeLists.txt ++++ b/compizconfig/gsettings/mocks/CMakeLists.txt +@@ -8,7 +8,6 @@ if (GLIB_FOUND) + ${CMAKE_CURRENT_SOURCE_DIR}/../gsettings_backend_shared + ${GLIB_INCLUDE_DIRS}) + +- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") + + add_library (compizconfig_ccs_gsettings_wrapper_mock STATIC + ${CMAKE_CURRENT_SOURCE_DIR}/ccs_gsettings_wrapper_mock.cpp +diff --git a/compizconfig/gsettings/tests/CMakeLists.txt b/compizconfig/gsettings/tests/CMakeLists.txt +index 9a81a5d7c..ae3a1d370 100644 +--- a/compizconfig/gsettings/tests/CMakeLists.txt ++++ b/compizconfig/gsettings/tests/CMakeLists.txt +@@ -16,7 +16,6 @@ pkg_check_modules (COMPIZCONFIG_TEST_GSETTINGS gio-2.0 glib-2.0) + + if (COMPIZCONFIG_TEST_GSETTINGS_FOUND) + +- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") + + link_directories (${CMAKE_CURRENT_BINARY_DIR}/../../libcompizconfig/tests) + link_directories (${CMAKE_CURRENT_BINARY_DIR}/../testenvironments) +diff --git a/compizconfig/integration/gnome/gsettings/tests/CMakeLists.txt b/compizconfig/integration/gnome/gsettings/tests/CMakeLists.txt +index 683c83fcb..b6144fccb 100644 +--- a/compizconfig/integration/gnome/gsettings/tests/CMakeLists.txt ++++ b/compizconfig/integration/gnome/gsettings/tests/CMakeLists.txt +@@ -11,7 +11,6 @@ link_directories (${CMAKE_CURRENT_BINARY_DIR}/../../mocks/libcompizconfig) + link_directories (${CMAKE_CURRENT_BINARY_DIR}/../../tests/) + link_directories (${CMAKE_CURRENT_BINARY_DIR}/../src/) + +-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") + + add_executable (compizconfig_test_ccs_gnome_gsettings_integrated_setting + ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig_test_ccs_gnome_gsettings_integrated_setting.cpp) +diff --git a/compizconfig/integration/gnome/tests/CMakeLists.txt b/compizconfig/integration/gnome/tests/CMakeLists.txt +index 30fd55210..7df9c6e06 100644 +--- a/compizconfig/integration/gnome/tests/CMakeLists.txt ++++ b/compizconfig/integration/gnome/tests/CMakeLists.txt +@@ -8,7 +8,6 @@ include_directories (${CMAKE_CURRENT_SOURCE_DIR}/../../../gsettings/mocks) + include_directories (${CMAKE_SOURCE_DIR}/compizconfig/tests) + link_directories (${CMAKE_INSTALL_PREFIX}/lib) + +-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") + + add_library (compizconfig_ccs_mock_gnome_integrated_setting_composition + ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig_ccs_mock_gnome_integrated_setting_composition.c) +diff --git a/compizconfig/libcompizconfig/tests/CMakeLists.txt b/compizconfig/libcompizconfig/tests/CMakeLists.txt +index a3a42f98a..527467066 100644 +--- a/compizconfig/libcompizconfig/tests/CMakeLists.txt ++++ b/compizconfig/libcompizconfig/tests/CMakeLists.txt +@@ -9,7 +9,6 @@ link_directories (${CMAKE_CURRENT_BINARY_DIR}/../../mocks/libcompizconfig) + link_directories (${CMAKE_CURRENT_BINARY_DIR}/../../tests/) + link_directories (${CMAKE_CURRENT_BINARY_DIR}/../src/) + +-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") + + add_definitions (-DCONFIGDIR="${COMPIZCONFIG_CONFIG_DIR}") + +-- +2.45.1 + diff --git a/1002-releasing-package-compiz-version-1-0.9.14.2-22.10.20.patch b/1002-releasing-package-compiz-version-1-0.9.14.2-22.10.20.patch new file mode 100644 index 000000000000..4c7db1c72fef --- /dev/null +++ b/1002-releasing-package-compiz-version-1-0.9.14.2-22.10.20.patch @@ -0,0 +1,59 @@ +From 8a47e8da2c5b05f19870ef78ee902acf6d2ba17f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jeremy=20B=C3=ADcha?= <jeremy.bicha@canonical.com> +Date: Thu, 7 Mar 2024 15:44:43 -0500 +Subject: [PATCH 2/4] releasing package compiz version + 1:0.9.14.2+22.10.20220822-0ubuntu6 + +--- + a | 25 +++++++++++++++++++ + .../tests/compiz_config_test.py | 2 +- + 2 files changed, 26 insertions(+), 1 deletion(-) + create mode 100644 a + +diff --git a/a b/a +new file mode 100644 +index 000000000..4f955601c +--- /dev/null ++++ b/a +@@ -0,0 +1,25 @@ ++diff -Nru compiz-0.9.14.2+22.10.20220822/compizconfig/compizconfig-python/tests/compiz_config_test.py compiz-0.9.14.2+22.10.20220822/compizconfig/compizconfig-python/tests/compiz_config_test.py ++--- compiz-0.9.14.2+22.10.20220822/compizconfig/compizconfig-python/tests/compiz_config_test.py 2022-08-22 05:54:46.000000000 +0000 +++++ compiz-0.9.14.2+22.10.20220822/compizconfig/compizconfig-python/tests/compiz_config_test.py 2024-01-23 17:18:21.000000000 +0000 ++@@ -11,7 +11,7 @@ ++ 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 -Nru compiz-0.9.14.2+22.10.20220822/debian/changelog compiz-0.9.14.2+22.10.20220822/debian/changelog ++--- compiz-0.9.14.2+22.10.20220822/debian/changelog 2024-01-19 19:07:54.000000000 +0000 +++++ compiz-0.9.14.2+22.10.20220822/debian/changelog 2024-01-23 17:37:25.000000000 +0000 ++@@ -1,3 +1,9 @@ +++compiz (1:0.9.14.2+22.10.20220822-0ubuntu6) noble; urgency=medium +++ +++ * Adjust path for the CompizConfigPython tests (LP: #2050888) +++ +++ -- Graham Inggs <ginggs@ubuntu.com> Tue, 23 Jan 2024 17:37:25 +0000 +++ ++ compiz (1:0.9.14.2+22.10.20220822-0ubuntu5) noble; urgency=medium ++ ++ * No-change rebuild with Python 3.12 as default +diff --git a/compizconfig/compizconfig-python/tests/compiz_config_test.py b/compizconfig/compizconfig-python/tests/compiz_config_test.py +index cb6dc2237..7ac40b8e9 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 +-- +2.45.1 + @@ -2,17 +2,11 @@ # Contributor: Robert Brzozowski <robson75@linux.pl> # Contributor: Charles Bos <charlesbos1 AT gmail> -## options -: ${_build_git:=false} - -unset _pkgtype -[[ "${_build_git::1}" == "t" ]] && _pkgtype+="-git" - ## basic info _pkgname='compiz' -pkgname="$_pkgname${_pkgtype:-}" +pkgname="$_pkgname" pkgver=0.9.14.2 -pkgrel=5 +pkgrel=6 pkgdesc="Composite manager for Aiglx and Xgl, with plugins and CCSM" url="https://launchpad.net/compiz" arch=('i686' 'x86_64') @@ -22,128 +16,104 @@ license=( 'MIT' ) -# main package -_main_package() { - depends=( - 'boost-libs' - 'fuse2' - 'glibmm' - 'glu' - 'libnotify' - 'libwnck3' - 'libxslt' - 'metacity' - 'protobuf' - 'python-cairo' - 'python-gobject' - 'xorg-server' - ) - makedepends=( - 'boost' - 'cmake' - 'cython' - 'intltool' - 'python-setuptools' - ) - optdepends=( - 'xorg-xprop: grab various window properties for use in window matching rules' - ) - - conflicts=( - 'ccsm' - 'compiz-bcop' - 'compiz-core' - 'compiz-fusion-plugins-experimental' - 'compiz-fusion-plugins-extra' - 'compiz-fusion-plugins-main' - 'compiz-gtk' - 'compizconfig-python' - 'libcompizconfig' - 'simple-ccsm' - ) - provides=( - "ccsm=${pkgver:0:6}" - "compiz-bcop=${pkgver:0:6}" - "compiz-core=${pkgver:0:6}" - "compiz-plugins-extra=${pkgver:0:6}" - "compiz-plugins-main=${pkgver:0:6}" - "compizconfig-python=${pkgver:0:6}" - "libcompizconfig=${pkgver:0:6}" - ) - - if [ "${_build_git::1}" != "t" ] ; then - _main_stable - else - _main_git - fi - - source+=( - "focus-prevention-disable.patch" - "gtk-extents.patch" - "reverse-unity-config.patch" - "screenshot-launch-fix.patch" - "no-compile-gschemas.patch" - ) - sha256sums+=( - 'f4897590b0f677ba34767a29822f8f922a750daf66e8adf47be89f7c2550cf4b' - '16ddb6311ce42d958505e21ca28faae5deeddce02cb558d55e648380274ba4d9' - '6ec9c04540ca1649c687d9ab2c8311caea7075831e2cffe719ec7958c9ebab7b' - '89ee91a8ea6b1424ef76661ea9a2db43412366aacddc12d24a7adf5e04bfbc61' - '4ab3277da201314b3f65e30128bc30704ddee584fdbbfc8d0d83c7e0de91fa9a' - ) -} - -# stable package -_main_stable() { - _pkgsrc="$_pkgname-${pkgver%%.r*}" - _pkgext="tar.xz" - source+=( - "$_pkgsrc.$_pkgext"::"https://launchpad.net/$_pkgname/${pkgver:0:6}/${pkgver%%.r*}/+download/$_pkgsrc.$_pkgext" - ) - sha256sums+=( - 'cfa061e93b032275ff9e7041f582a8f6d5ae271cf8a89e6bc74e3d3635999d3c' - ) - - pkgver() { - echo "${pkgver%%.r*}" - } -} - -# git package -_main_git() { - makedepends+=('git') - - conflicts+=('compiz') - provides+=("compiz=${pkgver:0:6}") - - _pkgsrc="$_pkgname" - source+=("$_pkgsrc"::"git+https://git.launchpad.net/compiz") - sha256sums+=('SKIP') +depends=( + 'boost-libs' + 'fuse2' + 'glibmm' + 'glu' + 'libnotify' + 'libwnck3' + 'libxslt' + 'metacity' + 'protobuf' + 'python-cairo' + 'python-gobject' + 'xorg-server' +) +makedepends=( + 'boost' + 'cmake' + 'cython' + 'intltool' + 'python-setuptools' +) +optdepends=( + 'xorg-xprop: grab various window properties for use in window matching rules' +) - pkgver() { - cd "$_pkgsrc" - git describe --long --tags --abbrev=8 --exclude='*[a-zA-Z][a-zA-Z]*' | sed -E 's/^v//;s/([^-]*-g)/r\1/;s/-/./g' - } -} +conflicts=( + 'ccsm' + 'compiz-bcop' + 'compiz-core' + 'compiz-fusion-plugins-experimental' + 'compiz-fusion-plugins-extra' + 'compiz-fusion-plugins-main' + 'compiz-gtk' + 'compizconfig-python' + 'libcompizconfig' + 'simple-ccsm' +) +provides=( + "ccsm=${pkgver:0:6}" + "compiz-bcop=${pkgver:0:6}" + "compiz-core=${pkgver:0:6}" + "compiz-plugins-extra=${pkgver:0:6}" + "compiz-plugins-main=${pkgver:0:6}" + "compizconfig-python=${pkgver:0:6}" + "libcompizconfig=${pkgver:0:6}" +) -# common functions -prepare() { - cd "$_pkgsrc" +_pkgsrc="$_pkgname-${pkgver%%.r*}" +_pkgext="tar.xz" +source=( + "$_pkgsrc.$_pkgext"::"https://launchpad.net/$_pkgname/${pkgver:0:6}/${pkgver%%.r*}/+download/$_pkgsrc.$_pkgext" # Reverse Unity specific configuration patches - patch -p1 -i "$srcdir/reverse-unity-config.patch" + "0001-reverse-unity-config.patch" # Set focus prevention level to off which means that new windows will always get focus - patch -p1 -i "$srcdir/focus-prevention-disable.patch" + "0002-focus-prevention-disable.patch" # Fix incorrect extents for GTK+ tooltips, csd etc - patch -p1 -i "$srcdir/gtk-extents.patch" + "0003-gtk-extents.patch" # Fix application launching for the screenshot plugin - patch -p1 -i "$srcdir/screenshot-launch-fix.patch" + "0004-screenshot-launch-fix.patch" # Don't try to compile gschemas during make install - patch -p1 -i "$srcdir/no-compile-gschemas.patch" + "0005-no-compile-gschemas.patch" + + "0006-Drop-toggle-shaded-since-it-s-no-longer-included-in-.patch" + "0007-64-bit-time-t-compat.patch" + "1001-releasing-package-compiz-version-1-0.9.14.2-22.10.20.patch" + "1002-releasing-package-compiz-version-1-0.9.14.2-22.10.20.patch" +) +sha256sums=( + 'cfa061e93b032275ff9e7041f582a8f6d5ae271cf8a89e6bc74e3d3635999d3c' + '6ec9c04540ca1649c687d9ab2c8311caea7075831e2cffe719ec7958c9ebab7b' + 'f4897590b0f677ba34767a29822f8f922a750daf66e8adf47be89f7c2550cf4b' + '16ddb6311ce42d958505e21ca28faae5deeddce02cb558d55e648380274ba4d9' + '89ee91a8ea6b1424ef76661ea9a2db43412366aacddc12d24a7adf5e04bfbc61' + '4ab3277da201314b3f65e30128bc30704ddee584fdbbfc8d0d83c7e0de91fa9a' + '9b9e92a7174f2255f408d340dcb7b765211777cd92fe9ed17b5888ff13578291' + '90969b7beba107a7146b11c3a60969b62c2be7a3e891d7dee913504ec6de759c' + '3c7ed442af8ec99ab521afbd64cb97fc0ae5d2ec6b6506a8e79c7b65fda342c0' + 'f68b6ada12a720853d6abe04a623448e31bf2dae6c3a66d935c937bcf374cd19' +) + +prepare() { + cd "$_pkgsrc" + + local src + for src in "${source[@]}"; do + src="${src%%::*}" + src="${src##*/}" + src="${src%.zst}" + if [[ $src == *.patch ]]; then + printf '\nApplying patch: %s\n' "$src" + patch -Np1 -F100 -i "${srcdir:?}/$src" + fi + done } build() { @@ -152,7 +122,7 @@ build() { -S "$_pkgsrc" -DCMAKE_CXX_STANDARD=17 - -DCMAKE_BUILD_TYPE="Release" + -DCMAKE_BUILD_TYPE=None -DCMAKE_INSTALL_PREFIX="/usr" -DCMAKE_INSTALL_LIBDIR="/usr/lib" -DCOMPIZ_DISABLE_SCHEMAS_INSTALL=ON @@ -181,10 +151,6 @@ package() { install -Dm644 "$_pkgsrc/cmake/FindCompiz.cmake" \ -t "${pkgdir}${CMAKE_DIR}/Modules/" - # documentation - #install -Dm644 "$_pkgsrc"/{AUTHORS,NEWS,README} \ - # -t "$pkgdir/usr/share/doc/compiz/" - # gsettings schema files if ls build/generated/glib-2.0/schemas/ | grep -qm1 .gschema.xml; then install -Dm644 build/generated/glib-2.0/schemas/*.gschema.xml \ @@ -195,6 +161,3 @@ package() { install -Dm644 "$_pkgsrc"/{COPYING,COPYING.GPL,COPYING.LGPL,COPYING.MIT} \ -t "$pkgdir/usr/share/licenses/$pkgname" } - -# execute -_main_package |