diff options
-rw-r--r-- | .SRCINFO | 59 | ||||
-rw-r--r-- | .gitignore | 4 | ||||
-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-- | PKGBUILD | 209 |
8 files changed, 168 insertions, 104 deletions
@@ -1,61 +1,62 @@ pkgbase = compiz-git - pkgdesc = Composite manager for Aiglx and Xgl, with plugins and CCSM (development version) - pkgver = 0.9.14.1.r0.g71fcf28a6 + pkgdesc = Composite manager for Aiglx and Xgl, with plugins and CCSM + pkgver = 0.9.14.2.r11.g8196e9c pkgrel = 1 url = https://launchpad.net/compiz arch = i686 arch = x86_64 - license = GPL - license = LGPL + license = GPL-2.0-or-later + license = LGPL-2.1-or-later license = MIT makedepends = boost makedepends = cmake + makedepends = cython makedepends = git makedepends = intltool - makedepends = cython + makedepends = python-setuptools depends = boost-libs - depends = xorg-server depends = fuse2 depends = glibmm + depends = glu + depends = libnotify depends = libwnck3 - depends = python-gobject - depends = python-cairo - depends = protobuf + depends = libxslt depends = metacity - depends = glu + depends = protobuf + depends = python-cairo + depends = python-gobject + depends = xorg-server optdepends = xorg-xprop: grab various window properties for use in window matching rules - provides = compiz=0.9.14 - provides = compiz-core=0.9.14 - provides = compiz-bcop=0.9.14 provides = ccsm=0.9.14 - provides = compiz-plugins-main=0.9.14 + provides = compiz-bcop=0.9.14 + provides = compiz-core=0.9.14 provides = compiz-plugins-extra=0.9.14 + provides = compiz-plugins-main=0.9.14 provides = compizconfig-python=0.9.14 provides = libcompizconfig=0.9.14 - conflicts = compiz - conflicts = compiz-core - conflicts = compiz-gtk - conflicts = compiz-bcop + provides = compiz=0.9.14 conflicts = ccsm - conflicts = compiz-fusion-plugins-main - conflicts = compiz-fusion-plugins-extra + conflicts = compiz-bcop + conflicts = compiz-core conflicts = compiz-fusion-plugins-experimental + conflicts = compiz-fusion-plugins-extra + conflicts = compiz-fusion-plugins-main + conflicts = compiz-gtk conflicts = compizconfig-python conflicts = libcompizconfig conflicts = simple-ccsm - replaces = compiz-bzr - source = 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 + conflicts = compiz + source = compiz::git+https://git.launchpad.net/compiz + 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 pkgname = compiz-git - diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..018a3de08144 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +* +!PKGBUILD +!.SRCINFO +!.gitignore 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 @@ -1,105 +1,164 @@ -# Maintainer: Robert Brzozowski <robson75@linux.pl> -# Maintainer: Charles Bos <charlesbos1 AT gmail> -# Contributor: Rob McCathie <archaur at rmcc dot com dot au -# Contributor: /dev/rs0 <rs0@secretco.de.com> -# Contributor: Iven Hsu <ivenvd AT gmail> -# Contributor: Nathan Hulse <nat.hulse@gmail.com> - -pkgname=compiz-git -pkgver=0.9.14.1.r0.g71fcf28a6 +# Maintainer: +# Contributor: Robert Brzozowski <robson75@linux.pl> +# Contributor: Charles Bos <charlesbos1 AT gmail> + +## basic info +_pkgname='compiz' +pkgname="$_pkgname-git" +pkgver=0.9.14.2.r11.g8196e9c pkgrel=1 -_gitname=compiz -pkgdesc="Composite manager for Aiglx and Xgl, with plugins and CCSM (development version)" -arch=('i686' 'x86_64') +pkgdesc="Composite manager for Aiglx and Xgl, with plugins and CCSM" url="https://launchpad.net/compiz" -license=('GPL' 'LGPL' 'MIT') -depends=('boost-libs' 'xorg-server' 'fuse2' 'glibmm' 'libwnck3' 'python-gobject' 'python-cairo' 'protobuf' 'metacity' 'glu') -makedepends=('boost' 'cmake' 'git' 'intltool' 'cython') +arch=('i686' 'x86_64') +license=( + 'GPL-2.0-or-later' + 'LGPL-2.1-or-later' + 'MIT' +) + +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=("${_gitname}" 'compiz-core' 'compiz-gtk' 'compiz-bcop' 'ccsm' 'compiz-fusion-plugins-main' 'compiz-fusion-plugins-extra' 'compiz-fusion-plugins-experimental' 'compizconfig-python' 'libcompizconfig' 'simple-ccsm') -provides=("${_gitname}=${pkgver:0:6}" "compiz-core=${pkgver:0:6}" "compiz-bcop=${pkgver:0:6}" "ccsm=${pkgver:0:6}" "compiz-plugins-main=${pkgver:0:6}" "compiz-plugins-extra=${pkgver:0:6}" "compizconfig-python=${pkgver:0:6}" "libcompizconfig=${pkgver:0:6}") -replaces=('compiz-bzr') -source=("git+https://git.launchpad.net/${_gitname}" - "focus-prevention-disable.patch" - "gtk-extents.patch" - "reverse-unity-config.patch" - "screenshot-launch-fix.patch" - "no-compile-gschemas.patch") -sha256sums=('SKIP' - 'f4897590b0f677ba34767a29822f8f922a750daf66e8adf47be89f7c2550cf4b' - '16ddb6311ce42d958505e21ca28faae5deeddce02cb558d55e648380274ba4d9' - '6ec9c04540ca1649c687d9ab2c8311caea7075831e2cffe719ec7958c9ebab7b' - '89ee91a8ea6b1424ef76661ea9a2db43412366aacddc12d24a7adf5e04bfbc61' - '4ab3277da201314b3f65e30128bc30704ddee584fdbbfc8d0d83c7e0de91fa9a') -pkgver() { - cd "${_gitname}" - git describe --long --tags | sed 's/.%//;s/\+.*ubuntu.//;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}" +) -prepare() { - cd "${_gitname}" +conflicts+=('compiz') +provides+=("compiz=${pkgver:0:6}") + +_pkgsrc="$_pkgname" +source=( + "$_pkgsrc"::"git+https://git.launchpad.net/compiz" # 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" +) +sha256sums=( + 'SKIP' + + '6ec9c04540ca1649c687d9ab2c8311caea7075831e2cffe719ec7958c9ebab7b' + 'f4897590b0f677ba34767a29822f8f922a750daf66e8adf47be89f7c2550cf4b' + '16ddb6311ce42d958505e21ca28faae5deeddce02cb558d55e648380274ba4d9' + '89ee91a8ea6b1424ef76661ea9a2db43412366aacddc12d24a7adf5e04bfbc61' + '4ab3277da201314b3f65e30128bc30704ddee584fdbbfc8d0d83c7e0de91fa9a' +) + +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' +} + +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() { - cd "${_gitname}" - - mkdir build; cd build - - cmake .. \ - -DCMAKE_INSTALL_PREFIX="/usr" \ - -DCMAKE_INSTALL_LIBDIR="/usr/lib" \ - -DCOMPIZ_DISABLE_SCHEMAS_INSTALL=On \ - -DCOMPIZ_BUILD_WITH_RPATH=Off \ - -DCOMPIZ_PACKAGING_ENABLED=On \ - -DBUILD_GTK=On \ - -DBUILD_METACITY=On \ - -DBUILD_KDE4=Off \ - -DCOMPIZ_BUILD_TESTING=Off \ - -DCOMPIZ_WERROR=Off \ + local _cmake_options=( + -B build + -S "$_pkgsrc" + + -DCMAKE_CXX_STANDARD=17 + -DCMAKE_BUILD_TYPE=None + -DCMAKE_INSTALL_PREFIX="/usr" + -DCMAKE_INSTALL_LIBDIR="/usr/lib" + -DCOMPIZ_DISABLE_SCHEMAS_INSTALL=ON + -DCOMPIZ_BUILD_WITH_RPATH=OFF + -DCOMPIZ_PACKAGING_ENABLED=ON + -DBUILD_GTK=ON + -DBUILD_METACITY=ON + -DBUILD_KDE4=OFF -DCOMPIZ_DEFAULT_PLUGINS="composite,opengl,decor,resize,place,move,compiztoolbox,staticswitcher,regex,animation,wall,ccp" - make + -DCOMPIZ_BUILD_TESTING=OFF + -DCOMPIZ_WERROR=OFF + -Wno-dev + ) + + cmake "${_cmake_options[@]}" + cmake --build build } package() { - cd "${_gitname}/build" - make DESTDIR="${pkgdir}" install + DESTDIR="$pkgdir" cmake --install build # findcompiz_install needs COMPIZ_DESTDIR and install needs DESTDIR # make findcompiz_install CMAKE_DIR=$(cmake --system-information | grep '^CMAKE_ROOT' | awk -F\" '{print $2}') - install -dm755 "${pkgdir}${CMAKE_DIR}/Modules/" - install -m644 ../cmake/FindCompiz.cmake "${pkgdir}${CMAKE_DIR}/Modules/" - - # Add documentation - install -dm755 "${pkgdir}/usr/share/doc/compiz/" - install ../{AUTHORS,NEWS,README} "${pkgdir}/usr/share/doc/compiz/" - - # Add gsettings schema files - if ls generated/glib-2.0/schemas/ | grep -qm1 .gschema.xml; then - install -dm755 "${pkgdir}/usr/share/glib-2.0/schemas/" - install -m644 generated/glib-2.0/schemas/*.gschema.xml "${pkgdir}/usr/share/glib-2.0/schemas/" - fi - - # Install licenses - install -dm755 "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 "${srcdir}/${_gitname}"/{COPYING,COPYING.GPL,COPYING.LGPL,COPYING.MIT} "${pkgdir}/usr/share/licenses/${pkgname}" + install -Dm644 "$_pkgsrc/cmake/FindCompiz.cmake" \ + -t "${pkgdir}${CMAKE_DIR}/Modules/" + + # 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 \ + -t "$pkgdir/usr/share/glib-2.0/schemas/" + fi + + # licenses + install -Dm644 "$_pkgsrc"/{COPYING,COPYING.GPL,COPYING.LGPL,COPYING.MIT} \ + -t "$pkgdir/usr/share/licenses/$pkgname" } |