summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCharles Bos2019-02-17 15:42:29 +0000
committerCharles Bos2019-02-17 15:42:29 +0000
commit1027589694aa5da4dd107d79161ef2325fd09e00 (patch)
tree1f055b86f2ae3d81c43f831b2480464a6bc6ca72
parent72188280d21332846b2dee56ec3db91cbe0d4b80 (diff)
downloadaur-1027589694aa5da4dd107d79161ef2325fd09e00.tar.gz
Incorporate decor command sed line into the config patch, use a single install command for the licenses
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD13
-rw-r--r--reverse-unity-config.patch66
3 files changed, 38 insertions, 45 deletions
diff --git a/.SRCINFO b/.SRCINFO
index cc84a31b92a..c24fc15162e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = compiz-git
pkgdesc = Composite manager for Aiglx and Xgl, with plugins and CCSM (development version)
pkgver = 0.9.14.0.r0.gb340cc413
- pkgrel = 1
+ pkgrel = 2
url = https://launchpad.net/compiz
arch = i686
arch = x86_64
@@ -53,7 +53,7 @@ pkgbase = compiz-git
sha256sums = SKIP
sha256sums = f4897590b0f677ba34767a29822f8f922a750daf66e8adf47be89f7c2550cf4b
sha256sums = 16ddb6311ce42d958505e21ca28faae5deeddce02cb558d55e648380274ba4d9
- sha256sums = fba56d3e5fc8d1b47be2b8eaa6d79f48635daccc26db9b0b88fa281cc50c635e
+ sha256sums = 6ec9c04540ca1649c687d9ab2c8311caea7075831e2cffe719ec7958c9ebab7b
sha256sums = 89ee91a8ea6b1424ef76661ea9a2db43412366aacddc12d24a7adf5e04bfbc61
sha256sums = 4ab3277da201314b3f65e30128bc30704ddee584fdbbfc8d0d83c7e0de91fa9a
diff --git a/PKGBUILD b/PKGBUILD
index 8cb4b05ba1d..25eb6d6b575 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
pkgname=compiz-git
pkgver=0.9.14.0.r0.gb340cc413
-pkgrel=1
+pkgrel=2
_gitname=compiz
pkgdesc="Composite manager for Aiglx and Xgl, with plugins and CCSM (development version)"
arch=('i686' 'x86_64')
@@ -29,7 +29,7 @@ source=("git+https://git.launchpad.net/${_gitname}"
sha256sums=('SKIP'
'f4897590b0f677ba34767a29822f8f922a750daf66e8adf47be89f7c2550cf4b'
'16ddb6311ce42d958505e21ca28faae5deeddce02cb558d55e648380274ba4d9'
- 'fba56d3e5fc8d1b47be2b8eaa6d79f48635daccc26db9b0b88fa281cc50c635e'
+ '6ec9c04540ca1649c687d9ab2c8311caea7075831e2cffe719ec7958c9ebab7b'
'89ee91a8ea6b1424ef76661ea9a2db43412366aacddc12d24a7adf5e04bfbc61'
'4ab3277da201314b3f65e30128bc30704ddee584fdbbfc8d0d83c7e0de91fa9a')
@@ -44,10 +44,6 @@ prepare() {
# Reverse Unity specific configuration patches
patch -p1 -i "${srcdir}/reverse-unity-config.patch"
- # Fix decorator start command
- # This MUST be run AFTER reverse-unity-config.patch. Otherwise it has no effect at all
- sed -i 's/exec \\"${COMPIZ_BIN_PATH}compiz-decorator\\"/exec \/usr\/bin\/compiz-decorator/g' plugins/decor/decor.xml.in
-
# Set focus prevention level to off which means that new windows will always get focus
patch -p1 -i "${srcdir}/focus-prevention-disable.patch"
@@ -104,8 +100,5 @@ package() {
# Install licenses
install -dm755 "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m644 "${srcdir}/${_gitname}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m644 "${srcdir}/${_gitname}/COPYING.GPL" "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m644 "${srcdir}/${_gitname}/COPYING.LGPL" "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m644 "${srcdir}/${_gitname}/COPYING.MIT" "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 "${srcdir}/${_gitname}"/{COPYING,COPYING.GPL,COPYING.LGPL,COPYING.MIT} "${pkgdir}/usr/share/licenses/${pkgname}"
}
diff --git a/reverse-unity-config.patch b/reverse-unity-config.patch
index e5630928307..6828481af83 100644
--- a/reverse-unity-config.patch
+++ b/reverse-unity-config.patch
@@ -1,6 +1,6 @@
diff -Nur original/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml modified/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml
---- original/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml 2018-08-06 18:15:54.363059834 +0100
-+++ modified/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml 2018-08-06 18:16:43.161981494 +0100
+--- original/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml 2019-02-16 12:44:41.000000000 +0000
++++ modified/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml 2019-02-17 14:11:58.762747647 +0000
@@ -10,9 +10,6 @@
<key type="s" name="command-screenshot">
<default>"gnome-screenshot"</default>
@@ -22,8 +22,8 @@ diff -Nur original/compizconfig/integration/gnome/gsettings/org.compiz.integrate
<default>""</default>
</key>
diff -Nur original/metadata/core.xml.in modified/metadata/core.xml.in
---- original/metadata/core.xml.in 2018-08-06 18:15:54.383049834 +0100
-+++ modified/metadata/core.xml.in 2018-08-06 18:16:43.165313161 +0100
+--- original/metadata/core.xml.in 2019-02-16 12:44:41.000000000 +0000
++++ modified/metadata/core.xml.in 2019-02-17 14:11:58.762747647 +0000
@@ -144,7 +144,7 @@
<option name="focus_prevention_match" type="match">
<_short>Focus Prevention Windows</_short>
@@ -87,8 +87,8 @@ diff -Nur original/metadata/core.xml.in modified/metadata/core.xml.in
<max>32</max>
</option>
diff -Nur original/plugins/animation/animation.xml.in modified/plugins/animation/animation.xml.in
---- original/plugins/animation/animation.xml.in 2018-08-06 18:15:54.403039834 +0100
-+++ modified/plugins/animation/animation.xml.in 2018-08-06 18:16:43.171976494 +0100
+--- original/plugins/animation/animation.xml.in 2019-02-16 12:44:41.000000000 +0000
++++ modified/plugins/animation/animation.xml.in 2019-02-17 14:11:58.766082647 +0000
@@ -36,7 +36,7 @@
<extensible/>
<sort start="2"/>
@@ -228,8 +228,8 @@ diff -Nur original/plugins/animation/animation.xml.in modified/plugins/animation
<max>1</max>
<precision>0.01</precision>
diff -Nur original/plugins/commands/commands.xml.in modified/plugins/commands/commands.xml.in
---- original/plugins/commands/commands.xml.in 2018-08-06 18:15:54.413034833 +0100
-+++ modified/plugins/commands/commands.xml.in 2018-08-06 18:16:43.175308160 +0100
+--- original/plugins/commands/commands.xml.in 2019-02-16 12:44:41.000000000 +0000
++++ modified/plugins/commands/commands.xml.in 2019-02-17 14:11:58.766082647 +0000
@@ -117,7 +117,7 @@
<option name="command20" type="string">
<_short>Command line 20</_short>
@@ -248,8 +248,8 @@ diff -Nur original/plugins/commands/commands.xml.in modified/plugins/commands/co
</group>
<group>
diff -Nur original/plugins/decor/decor.xml.in modified/plugins/decor/decor.xml.in
---- original/plugins/decor/decor.xml.in 2018-08-06 18:15:54.453014834 +0100
-+++ modified/plugins/decor/decor.xml.in 2018-08-06 18:21:54.379628141 +0100
+--- original/plugins/decor/decor.xml.in 2019-02-16 12:44:41.000000000 +0000
++++ modified/plugins/decor/decor.xml.in 2019-02-17 14:13:24.345517674 +0000
@@ -31,7 +31,7 @@
<option name="active_shadow_opacity" type="float">
<_short>Shadow Opacity</_short>
@@ -282,13 +282,13 @@ diff -Nur original/plugins/decor/decor.xml.in modified/plugins/decor/decor.xml.i
<_short>Command</_short>
<_long>Decorator command line that is executed if no decorator is already running.</_long>
- <default>gtk-window-decorator</default>
-+ <default>exec \"${COMPIZ_BIN_PATH}compiz-decorator\"</default>
++ <default>exec /usr/bin/compiz-decorator</default>
</option>
<option name="mipmap" type="bool">
<_short>Mipmap</_short>
diff -Nur original/plugins/expo/expo.xml.in modified/plugins/expo/expo.xml.in
---- original/plugins/expo/expo.xml.in 2018-08-06 18:15:54.453014834 +0100
-+++ modified/plugins/expo/expo.xml.in 2018-08-06 18:16:43.178639827 +0100
+--- original/plugins/expo/expo.xml.in 2019-02-16 12:44:41.000000000 +0000
++++ modified/plugins/expo/expo.xml.in 2019-02-17 14:11:58.766082647 +0000
@@ -17,7 +17,6 @@
<plugin>wobbly</plugin>
<plugin>animation</plugin>
@@ -384,8 +384,8 @@ diff -Nur original/plugins/expo/expo.xml.in modified/plugins/expo/expo.xml.in
<option name="ground_color1" type="color">
<_short>Ground Color (near)</_short>
diff -Nur original/plugins/ezoom/ezoom.xml.in modified/plugins/ezoom/ezoom.xml.in
---- original/plugins/ezoom/ezoom.xml.in 2018-08-06 18:15:54.453014834 +0100
-+++ modified/plugins/ezoom/ezoom.xml.in 2018-08-06 18:16:43.191966494 +0100
+--- original/plugins/ezoom/ezoom.xml.in 2019-02-16 12:44:41.000000000 +0000
++++ modified/plugins/ezoom/ezoom.xml.in 2019-02-17 14:11:58.766082647 +0000
@@ -30,7 +30,7 @@
<option type="button" name="zoom_in_button">
<_short>Zoom In Button</_short>
@@ -423,8 +423,8 @@ diff -Nur original/plugins/ezoom/ezoom.xml.in modified/plugins/ezoom/ezoom.xml.i
</subgroup>
</group>
diff -Nur original/plugins/fade/fade.xml.in modified/plugins/fade/fade.xml.in
---- original/plugins/fade/fade.xml.in 2018-08-06 18:15:54.453014834 +0100
-+++ modified/plugins/fade/fade.xml.in 2018-08-06 18:16:43.191966494 +0100
+--- original/plugins/fade/fade.xml.in 2019-02-16 12:44:41.000000000 +0000
++++ modified/plugins/fade/fade.xml.in 2019-02-17 14:11:58.772752647 +0000
@@ -10,7 +10,6 @@
</requirement>
<relation type="after">
@@ -443,8 +443,8 @@ diff -Nur original/plugins/fade/fade.xml.in modified/plugins/fade/fade.xml.in
<option name="visual_bell" type="bell">
<_short>Visual Bell</_short>
diff -Nur original/plugins/gnomecompat/gnomecompat.xml.in modified/plugins/gnomecompat/gnomecompat.xml.in
---- original/plugins/gnomecompat/gnomecompat.xml.in 2018-08-06 18:15:54.463009833 +0100
-+++ modified/plugins/gnomecompat/gnomecompat.xml.in 2018-08-06 18:16:43.195298161 +0100
+--- original/plugins/gnomecompat/gnomecompat.xml.in 2019-02-16 12:44:41.000000000 +0000
++++ modified/plugins/gnomecompat/gnomecompat.xml.in 2019-02-17 14:11:58.772752647 +0000
@@ -57,7 +57,6 @@
<option name="run_command_terminal_key" type="key">
<_short>Open a terminal</_short>
@@ -454,8 +454,8 @@ diff -Nur original/plugins/gnomecompat/gnomecompat.xml.in modified/plugins/gnome
</group>
</options>
diff -Nur original/plugins/grid/grid.xml.in modified/plugins/grid/grid.xml.in
---- original/plugins/grid/grid.xml.in 2018-08-06 18:15:54.463009833 +0100
-+++ modified/plugins/grid/grid.xml.in 2018-08-06 18:16:43.198629827 +0100
+--- original/plugins/grid/grid.xml.in 2019-02-16 12:44:41.000000000 +0000
++++ modified/plugins/grid/grid.xml.in 2019-02-17 14:11:58.779422647 +0000
@@ -68,12 +68,12 @@
<option name="put_maximize_key" type="key">
<_short>Maximize Key</_short>
@@ -472,8 +472,8 @@ diff -Nur original/plugins/grid/grid.xml.in modified/plugins/grid/grid.xml.in
<option name="left_maximize" type="key">
<_short>Left Maximize</_short>
diff -Nur original/plugins/resize/resize.xml.in modified/plugins/resize/resize.xml.in
---- original/plugins/resize/resize.xml.in 2018-08-06 18:15:54.522979833 +0100
-+++ modified/plugins/resize/resize.xml.in 2018-08-06 18:16:43.201961494 +0100
+--- original/plugins/resize/resize.xml.in 2019-02-16 12:44:41.000000000 +0000
++++ modified/plugins/resize/resize.xml.in 2019-02-17 14:11:58.779422647 +0000
@@ -56,7 +56,7 @@
<option name="maximize_vertically" type="bool">
<short>Maximize Vertically if screen edge hit</short>
@@ -512,8 +512,8 @@ diff -Nur original/plugins/resize/resize.xml.in modified/plugins/resize/resize.x
</option>
<option name="disable_blend" type="bool">
diff -Nur original/plugins/scale/scale.xml.in modified/plugins/scale/scale.xml.in
---- original/plugins/scale/scale.xml.in 2018-08-06 18:15:54.522979833 +0100
-+++ modified/plugins/scale/scale.xml.in 2018-08-06 18:16:43.201961494 +0100
+--- original/plugins/scale/scale.xml.in 2019-02-16 12:44:41.000000000 +0000
++++ modified/plugins/scale/scale.xml.in 2019-02-17 14:11:58.779422647 +0000
@@ -21,7 +21,7 @@
<option name="spacing" type="int">
<_short>Spacing</_short>
@@ -603,8 +603,8 @@ diff -Nur original/plugins/scale/scale.xml.in modified/plugins/scale/scale.xml.i
<option name="initiate_group_edge" type="edge">
<_short>Initiate Window Picker For Window Group</_short>
diff -Nur original/plugins/staticswitcher/staticswitcher.xml.in modified/plugins/staticswitcher/staticswitcher.xml.in
---- original/plugins/staticswitcher/staticswitcher.xml.in 2018-08-06 18:15:54.542969833 +0100
-+++ modified/plugins/staticswitcher/staticswitcher.xml.in 2018-08-06 18:16:43.205293160 +0100
+--- original/plugins/staticswitcher/staticswitcher.xml.in 2019-02-16 12:44:41.000000000 +0000
++++ modified/plugins/staticswitcher/staticswitcher.xml.in 2019-02-17 14:11:58.782757647 +0000
@@ -11,6 +11,7 @@
<relation type="after">
<plugin>composite</plugin>
@@ -682,8 +682,8 @@ diff -Nur original/plugins/staticswitcher/staticswitcher.xml.in modified/plugins
<value>0</value>
<_name>None</_name>
diff -Nur original/plugins/vpswitch/vpswitch.xml.in modified/plugins/vpswitch/vpswitch.xml.in
---- original/plugins/vpswitch/vpswitch.xml.in 2018-08-06 18:15:54.552964834 +0100
-+++ modified/plugins/vpswitch/vpswitch.xml.in 2018-08-06 18:16:43.208624827 +0100
+--- original/plugins/vpswitch/vpswitch.xml.in 2019-02-16 12:44:41.000000000 +0000
++++ modified/plugins/vpswitch/vpswitch.xml.in 2019-02-17 14:11:58.782757647 +0000
@@ -95,11 +95,13 @@
<option name="next_button" type="button">
<_short>Move Next</_short>
@@ -699,8 +699,8 @@ diff -Nur original/plugins/vpswitch/vpswitch.xml.in modified/plugins/vpswitch/vp
</option>
<option name="initiate_button" type="button">
diff -Nur original/plugins/wall/wall.xml.in modified/plugins/wall/wall.xml.in
---- original/plugins/wall/wall.xml.in 2018-08-06 18:15:54.552964834 +0100
-+++ modified/plugins/wall/wall.xml.in 2018-08-06 18:16:43.211956494 +0100
+--- original/plugins/wall/wall.xml.in 2019-02-16 12:44:41.000000000 +0000
++++ modified/plugins/wall/wall.xml.in 2019-02-17 14:11:58.782757647 +0000
@@ -30,12 +30,12 @@
<option name="miniscreen" type="bool">
<_short>Show Live Viewport Previews</_short>
@@ -858,8 +858,8 @@ diff -Nur original/plugins/wall/wall.xml.in modified/plugins/wall/wall.xml.in
<option name="edgeflip_dnd" type="bool">
<_short>Edge Flip DnD</_short>
diff -Nur original/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp modified/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp
---- original/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp 2018-08-06 18:15:54.632924833 +0100
-+++ modified/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp 2018-08-06 18:16:43.211956494 +0100
+--- original/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp 2019-02-16 12:44:41.000000000 +0000
++++ modified/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp 2019-02-17 14:11:58.782757647 +0000
@@ -46,7 +46,7 @@
namespace