0.9.14.2.r11

7 files changed, 96 insertions, 132 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b02aefb5256b..ed8b9be1145e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = compiz-git
 	pkgdesc = Composite manager for Aiglx and Xgl, with plugins and CCSM
-	pkgver = 0.9.14.2.r6.g275e8550
+	pkgver = 0.9.14.2.r11.g8196e9c
 	pkgrel = 1
 	url = https://launchpad.net/compiz
 	arch = i686
@@ -11,9 +11,9 @@ pkgbase = compiz-git
 	makedepends = boost
 	makedepends = cmake
 	makedepends = cython
+	makedepends = git
 	makedepends = intltool
 	makedepends = python-setuptools
-	makedepends = git
 	depends = boost-libs
 	depends = fuse2
 	depends = glibmm
@@ -47,15 +47,15 @@ pkgbase = compiz-git
 	conflicts = simple-ccsm
 	conflicts = compiz
 	source = compiz::git+https://git.launchpad.net/compiz
-	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
 	sha256sums = SKIP
+	sha256sums = 6ec9c04540ca1649c687d9ab2c8311caea7075831e2cffe719ec7958c9ebab7b
 	sha256sums = f4897590b0f677ba34767a29822f8f922a750daf66e8adf47be89f7c2550cf4b
 	sha256sums = 16ddb6311ce42d958505e21ca28faae5deeddce02cb558d55e648380274ba4d9
-	sha256sums = 6ec9c04540ca1649c687d9ab2c8311caea7075831e2cffe719ec7958c9ebab7b
 	sha256sums = 89ee91a8ea6b1424ef76661ea9a2db43412366aacddc12d24a7adf5e04bfbc61
 	sha256sums = 4ab3277da201314b3f65e30128bc30704ddee584fdbbfc8d0d83c7e0de91fa9a
 
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/PKGBUILD b/PKGBUILD
index 41800fb95e42..0efed6a0ff8b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,16 +2,10 @@
 # Contributor: Robert Brzozowski <robson75@linux.pl>
 # Contributor: Charles Bos <charlesbos1 AT gmail>
 
-## options
-: ${_build_git:=true}
-
-unset _pkgtype
-[[ "${_build_git::1}" == "t" ]] && _pkgtype+="-git"
-
 ## basic info
 _pkgname='compiz'
-pkgname="$_pkgname${_pkgtype:-}"
-pkgver=0.9.14.2.r6.g275e8550
+pkgname="$_pkgname-git"
+pkgver=0.9.14.2.r11.g8196e9c
 pkgrel=1
 pkgdesc="Composite manager for Aiglx and Xgl, with plugins and CCSM"
 url="https://launchpad.net/compiz"
@@ -22,128 +16,105 @@ 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'
-  )
+depends=(
+  'boost-libs'
+  'fuse2'
+  'glibmm'
+  'glu'
+  'libnotify'
+  'libwnck3'
+  'libxslt'
+  'metacity'
+  'protobuf'
+  'python-cairo'
+  'python-gobject'
+  'xorg-server'
+)
+makedepends=(
+  'boost'
+  'cmake'
+  'cython'
+  'git'
+  '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}"
-  )
+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
+conflicts+=('compiz')
+provides+=("compiz=${pkgver:0:6}")
 
-  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'
-  )
-}
+_pkgsrc="$_pkgname"
+source=(
+  "$_pkgsrc"::"git+https://git.launchpad.net/compiz"
 
-# 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'
-  )
+  # Reverse Unity specific configuration patches
+  "0001-reverse-unity-config.patch"
 
-  pkgver() {
-    echo "${pkgver%%.r*}"
-  }
-}
+  # Set focus prevention level to off which means that new windows will always get focus
+  "0002-focus-prevention-disable.patch"
 
-# git package
-_main_git() {
-  makedepends+=('git')
+  # Fix incorrect extents for GTK+ tooltips, csd etc
+  "0003-gtk-extents.patch"
 
-  conflicts+=('compiz')
-  provides+=("compiz=${pkgver:0:6}")
+  # Fix application launching for the screenshot plugin
+  "0004-screenshot-launch-fix.patch"
 
-  _pkgsrc="$_pkgname"
-  source+=("$_pkgsrc"::"git+https://git.launchpad.net/compiz")
-  sha256sums+=('SKIP')
+  # Don't try to compile gschemas during make install
+  "0005-no-compile-gschemas.patch"
+)
+sha256sums=(
+  'SKIP'
+
+  '6ec9c04540ca1649c687d9ab2c8311caea7075831e2cffe719ec7958c9ebab7b'
+  'f4897590b0f677ba34767a29822f8f922a750daf66e8adf47be89f7c2550cf4b'
+  '16ddb6311ce42d958505e21ca28faae5deeddce02cb558d55e648380274ba4d9'
+  '89ee91a8ea6b1424ef76661ea9a2db43412366aacddc12d24a7adf5e04bfbc61'
+  '4ab3277da201314b3f65e30128bc30704ddee584fdbbfc8d0d83c7e0de91fa9a'
+)
 
-  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'
-  }
+pkgver() {
+  cd "$_pkgsrc"
+  git describe --long --tags --abbrev=7 --exclude='*[a-zA-Z][a-zA-Z]*' \
+    | sed -E 's/^v//;s/([^-]*-g)/r\1/;s/-/./g'
 }
 
-# common functions
 prepare() {
   cd "$_pkgsrc"
 
-  # Reverse Unity specific configuration patches
-  patch -p1 -i "$srcdir/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"
-
-  # Fix incorrect extents for GTK+ tooltips, csd etc
-  patch -p1 -i "$srcdir/gtk-extents.patch"
-
-  # Fix application launching for the screenshot plugin
-  patch -p1 -i "$srcdir/screenshot-launch-fix.patch"
-
-  # Don't try to compile gschemas during make install
-  patch -p1 -i "$srcdir/no-compile-gschemas.patch"
+  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 +123,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 +152,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 +162,3 @@ package() {
   install -Dm644 "$_pkgsrc"/{COPYING,COPYING.GPL,COPYING.LGPL,COPYING.MIT} \
     -t "$pkgdir/usr/share/licenses/$pkgname"
 }
-
-# execute
-_main_package