[compiz-ubuntu] Update to version 0.9.9~daily12.12.05 with Ubuntu rel…

…ease 0ubuntu2
CReimer · Jan 7, 2013 · 4fc066e · 4fc066e
1 parent bf160bd
commit 4fc066e
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 92 deletions.
diff --git a/compiz-ubuntu/0004_Use_python2.patch b/compiz-ubuntu/0004_Use_python2.patch
@@ -1,15 +1,15 @@
-diff -Nru compiz-0.9.8.4.orig/compizconfig/ccsm/ccsm compiz-0.9.8.4/compizconfig/ccsm/ccsm
---- compiz-0.9.8.4.orig/compizconfig/ccsm/ccsm	2012-10-02 14:20:36.950419021 -0400
-+++ compiz-0.9.8.4/compizconfig/ccsm/ccsm	2012-10-02 14:22:53.066348284 -0400
+diff -Nru compiz-0.9.9~daily12.12.05.orig/compizconfig/ccsm/ccsm compiz-0.9.9~daily12.12.05/compizconfig/ccsm/ccsm
+--- compiz-0.9.9~daily12.12.05.orig/compizconfig/ccsm/ccsm	2013-01-07 08:01:18.404547238 -0500
++++ compiz-0.9.9~daily12.12.05/compizconfig/ccsm/ccsm	2013-01-07 08:02:31.700828058 -0500
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  # -*- coding: UTF-8 -*-
 
  # This program is free software; you can redistribute it and/or
-diff -Nru compiz-0.9.8.4.orig/compizconfig/ccsm/CMakeLists.txt compiz-0.9.8.4/compizconfig/ccsm/CMakeLists.txt
---- compiz-0.9.8.4.orig/compizconfig/ccsm/CMakeLists.txt	2012-10-02 14:20:36.953752336 -0400
-+++ compiz-0.9.8.4/compizconfig/ccsm/CMakeLists.txt	2012-10-02 14:22:29.463142821 -0400
+diff -Nru compiz-0.9.9~daily12.12.05.orig/compizconfig/ccsm/CMakeLists.txt compiz-0.9.9~daily12.12.05/compizconfig/ccsm/CMakeLists.txt
+--- compiz-0.9.9~daily12.12.05.orig/compizconfig/ccsm/CMakeLists.txt	2013-01-07 08:01:18.407880554 -0500
++++ compiz-0.9.9~daily12.12.05/compizconfig/ccsm/CMakeLists.txt	2013-01-07 08:03:06.863976513 -0500
 @@ -12,7 +12,7 @@
  execute_process (COMMAND uname -p OUTPUT_VARIABLE PROC_ARCH)
 
@@ -19,7 +19,7 @@ diff -Nru compiz-0.9.8.4.orig/compizconfig/ccsm/CMakeLists.txt compiz-0.9.8.4/co
  		 OUTPUT_VARIABLE PY_VERSION)
 
  string (REPLACE "\n" "" PROC_ARCH ${PROC_ARCH})
-@@ -36,7 +36,7 @@
+@@ -36,14 +36,14 @@
  set (VERSION ${COMPIZ_RELEASE_VERSION})
 
  add_custom_command (OUTPUT ${PY_CCSM_LIB}
@@ -28,18 +28,17 @@ diff -Nru compiz-0.9.8.4.orig/compizconfig/ccsm/CMakeLists.txt compiz-0.9.8.4/co
  		    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
  		    COMMENT "Generating Python Bytecode")
 
-@@ -44,7 +44,7 @@
+ add_custom_target (ccsm_module ALL DEPENDS
                     ${PY_CCSM_LIB})
 
- add_custom_target (uninstall
--		   COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/setup.py uninstall --prefix=${CMAKE_INSTALL_PREFIX}
-+		   COMMAND python2 ${CMAKE_CURRENT_SOURCE_DIR}/setup.py uninstall --prefix=${CMAKE_INSTALL_PREFIX}
- 		   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- 		   COMMENT "Uninstalling Python Files")
+-set (UNINSTALL_COMMAND "python ${CMAKE_CURRENT_SOURCE_DIR}/setup.py uninstall --prefix=${CMAKE_INSTALL_PREFIX} --version=${VERSION}")
++set (UNINSTALL_COMMAND "python2 ${CMAKE_CURRENT_SOURCE_DIR}/setup.py uninstall --prefix=${CMAKE_INSTALL_PREFIX} --version=${VERSION}")
 
-diff -Nru compiz-0.9.8.4.orig/compizconfig/ccsm/Makefile compiz-0.9.8.4/compizconfig/ccsm/Makefile
---- compiz-0.9.8.4.orig/compizconfig/ccsm/Makefile	2012-10-02 14:20:36.883752714 -0400
-+++ compiz-0.9.8.4/compizconfig/ccsm/Makefile	2012-10-02 14:22:42.059741246 -0400
+ compiz_add_code_to_uninstall_target (${UNINSTALL_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR})
+
+diff -Nru compiz-0.9.9~daily12.12.05.orig/compizconfig/ccsm/Makefile compiz-0.9.9~daily12.12.05/compizconfig/ccsm/Makefile
+--- compiz-0.9.9~daily12.12.05.orig/compizconfig/ccsm/Makefile	2013-01-07 08:01:18.077882286 -0500
++++ compiz-0.9.9~daily12.12.05/compizconfig/ccsm/Makefile	2013-01-07 08:03:25.720543706 -0500
 @@ -1,11 +1,11 @@
  all:
 -	@python setup.py build --prefix=${PREFIX}
@@ -55,37 +54,28 @@ diff -Nru compiz-0.9.8.4.orig/compizconfig/ccsm/Makefile compiz-0.9.8.4/compizco
 
  clean:
  	rm -rf build/
-diff -Nru compiz-0.9.8.4.orig/compizconfig/compizconfig-python/CMakeLists.txt compiz-0.9.8.4/compizconfig/compizconfig-python/CMakeLists.txt
---- compiz-0.9.8.4.orig/compizconfig/compizconfig-python/CMakeLists.txt	2012-10-02 14:20:37.010418695 -0400
-+++ compiz-0.9.8.4/compizconfig/compizconfig-python/CMakeLists.txt	2012-10-02 14:23:38.342769668 -0400
-@@ -12,7 +12,7 @@
+diff -Nru compiz-0.9.9~daily12.12.05.orig/compizconfig/compizconfig-python/CMakeLists.txt compiz-0.9.9~daily12.12.05/compizconfig/compizconfig-python/CMakeLists.txt
+--- compiz-0.9.9~daily12.12.05.orig/compizconfig/compizconfig-python/CMakeLists.txt	2013-01-07 08:01:18.477880191 -0500
++++ compiz-0.9.9~daily12.12.05/compizconfig/compizconfig-python/CMakeLists.txt	2013-01-07 08:04:24.600232364 -0500
+@@ -5,7 +5,7 @@
  execute_process (COMMAND uname -p OUTPUT_VARIABLE PROC_ARCH)
 
  # Get Python Version
 -execute_process (COMMAND python -c "import sys; print str (sys.version_info[0]) + '.' + str (sys.version_info[1])"
 +execute_process (COMMAND python2 -c "import sys; print str (sys.version_info[0]) + '.' + str (sys.version_info[1])"
  		 OUTPUT_VARIABLE PY_VERSION)
 
- string (REPLACE "\n" "" PROC_ARCH ${PROC_ARCH})
-@@ -37,7 +37,7 @@
-                 ${CMAKE_CURRENT_BINARY_DIR}/compizconfig-python.pc)
+ find_package (PythonLibs)
+@@ -73,7 +73,7 @@
+ 		       ${PYTHON_LIBRARY_LOCAL}
+ 		       compizconfig)
 
- add_custom_command (OUTPUT ${PY_COMPIZCONFIG_LIB}
--		    COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/setup.py build --build-base=${CMAKE_CURRENT_BINARY_DIR}/build --version=${VERSION}
-+		    COMMAND python2 ${CMAKE_CURRENT_SOURCE_DIR}/setup.py build --build-base=${CMAKE_CURRENT_BINARY_DIR}/build --version=${VERSION}
- 		    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- 		    DEPENDS ${PY_COMPIZCONFIG_SRC} ${PY_COMPIZCONFIG_VERSION} compizconfig
- 		    COMMENT "Generating Python Bytecode")
-@@ -46,7 +46,7 @@
-                    ${PY_COMPIZCONFIG_LIB})
+-set (UNINSTALL_COMMAND "python ${CMAKE_CURRENT_SOURCE_DIR}/setup.py uninstall --prefix=${CMAKE_INSTALL_PREFIX} --version=${VERSION}")
++set (UNINSTALL_COMMAND "python2 ${CMAKE_CURRENT_SOURCE_DIR}/setup.py uninstall --prefix=${CMAKE_INSTALL_PREFIX} --version=${VERSION}")
 
- add_custom_target (uninstall
--		   COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/setup.py uninstall --prefix=${CMAKE_INSTALL_PREFIX}
-+		   COMMAND python2 ${CMAKE_CURRENT_SOURCE_DIR}/setup.py uninstall --prefix=${CMAKE_INSTALL_PREFIX}
- 		   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- 		   COMMENT "Uninstalling Python Files")
+ compiz_add_code_to_uninstall_target (${UNINSTALL_COMMAND} ${CMAKE_CURRENT_BINARY_DIR})
 
-@@ -60,7 +60,7 @@
+@@ -101,7 +101,7 @@
  if (COMPIZ_BUILD_TESTING)
 
          find_program (BASH_EXECUTABLE bash)
@@ -94,9 +84,9 @@ diff -Nru compiz-0.9.8.4.orig/compizconfig/compizconfig-python/CMakeLists.txt co
  	mark_as_advanced (FORCE PYTHON_EXECUTABLE)
 
  	file (GLOB PYTHON_TESTS "tests/test_*.py")
-diff -Nru compiz-0.9.8.4.orig/compizconfig/compizconfig-python/Makefile compiz-0.9.8.4/compizconfig/compizconfig-python/Makefile
---- compiz-0.9.8.4.orig/compizconfig/compizconfig-python/Makefile	2012-10-02 14:20:37.007085379 -0400
-+++ compiz-0.9.8.4/compizconfig/compizconfig-python/Makefile	2012-10-02 14:23:53.262688839 -0400
+diff -Nru compiz-0.9.9~daily12.12.05.orig/compizconfig/compizconfig-python/Makefile compiz-0.9.9~daily12.12.05/compizconfig/compizconfig-python/Makefile
+--- compiz-0.9.9~daily12.12.05.orig/compizconfig/compizconfig-python/Makefile	2013-01-07 08:01:18.477880191 -0500
++++ compiz-0.9.9~daily12.12.05/compizconfig/compizconfig-python/Makefile	2013-01-07 08:04:44.733459576 -0500
 @@ -1,11 +1,11 @@
  all:
 -	@python setup.py build --prefix=${PREFIX}

diff --git a/compiz-ubuntu/0005_Disable_Werror.patch b/compiz-ubuntu/0005_Disable_Werror.patch
@@ -0,0 +1,12 @@
+diff -Nru compiz-0.9.9~daily12.12.05.orig/cmake/CompizCommon.cmake compiz-0.9.9~daily12.12.05/cmake/CompizCommon.cmake
+--- compiz-0.9.9~daily12.12.05.orig/cmake/CompizCommon.cmake	2013-01-07 08:49:49.878610382 -0500
++++ compiz-0.9.9~daily12.12.05/cmake/CompizCommon.cmake	2013-01-07 08:50:54.194935065 -0500
+@@ -53,7 +53,7 @@
+ endif ()
+
+ if (${CMAKE_PROJECT_NAME} STREQUAL "compiz")
+-    set (COMPIZ_WERROR_DEFAULT ON)
++    set (COMPIZ_WERROR_DEFAULT OFF)
+ else ()
+     set (COMPIZ_WERROR_DEFAULT OFF)
+ endif ()
diff --git a/compiz-ubuntu/PKGBUILD b/compiz-ubuntu/PKGBUILD
@@ -7,76 +7,59 @@
 # makes it extremely hard to do.
 pkgname=compiz-ubuntu
 
-_ubuntu_rel=0ubuntu1
-_actual_ver=0.9.8.4
-_bzr_rev=3412
+_ubuntu_rel=0ubuntu2
+_actual_ver=0.9.9
+_extra_ver=\~daily12.12.05
 
-pkgver=${_actual_ver}.bzr${_bzr_rev}.${_ubuntu_rel}
+pkgver=${_actual_ver}${_extra_ver/\~/.}.${_ubuntu_rel}
 
 pkgrel=100
 pkgdesc="OpenGL window and compositing manager"
 url="http://www.compiz.org/"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('boost-libs' 'dbus' 'fuse' 'glibmm' 'gnome-control-center' 'librsvg' 'libxcomposite' 'libxdamage' 'libxinerama' 'libxrandr' 'libxslt' 'libwnck' 'mesa' 'metacity-ubuntu' 'startup-notification' 'protobuf' 'pyrex' 'gsettings-desktop-schemas' 'python2-gconf')
+depends=('boost-libs' 'dbus' 'fuse' 'glibmm' 'gnome-control-center' 'librsvg' 'libxcomposite' 'libxdamage' 'libxinerama' 'libxrandr' 'libxslt' 'libwnck' 'mesa' 'metacity-ubuntu' 'startup-notification' 'protobuf' 'pyrex' 'gsettings-desktop-schemas')
 makedepends=('boost' 'cmake' 'intltool' 'libwnck')
-provides=(compiz-core{,-ubuntu}="${pkgver}"
-          compiz-gnome{,-ubuntu}="${pkgver}"
-          compiz-kde{,-ubuntu}="${pkgver}"
-          libcompizconfig{,-ubuntu}="${pkgver}"
-          compizconfig-backend-gconf{,-ubuntu}="${pkgver}"
-          compizconfig-backend-kconfig4{,-ubuntu}="${pkgver}"
-          compizconfig-python{,-ubuntu}="${pkgver}"
-          ccsm{,-ubuntu}="${pkgver}"
-          compiz-plugins-main{,-ubuntu}="${pkgver}"
-          compiz-plugins-extra{,-ubuntu}="${pkgver}")
-conflicts=(compiz-core{,-ubuntu}
-           compiz-gnome{,-ubuntu}
-           compiz-kde{,-ubuntu}
-           libcompizconfig{,-ubuntu}
-           compizconfig-backend-gconf{,-ubuntu}
-           compizconfig-backend-kconfig4{,-ubuntu}
-           compizconfig-python{,-ubuntu}
-           ccsm{,-ubuntu}
-           compiz-plugins-main{,-ubuntu}
-           compiz-plugins-extra{,-ubuntu})
 groups=('unity')
 options=('emptydirs')
 install=compiz-ubuntu.install
-source=("https://launchpad.net/ubuntu/+archive/primary/+files/${pkgname%-*}_${_actual_ver}+bzr${_bzr_rev}.orig.tar.gz"
-        "https://launchpad.net/ubuntu/+archive/primary/+files/${pkgname%-*}_${_actual_ver}+bzr${_bzr_rev}-${_ubuntu_rel}.diff.gz"
+source=("https://launchpad.net/ubuntu/+archive/primary/+files/compiz_${_actual_ver}${_extra_ver}.orig.tar.gz"
+        "https://launchpad.net/ubuntu/+archive/primary/+files/compiz_${_actual_ver}${_extra_ver}-${_ubuntu_rel}.diff.gz"
         'compiz.reset'
         '0002_Fix_cmake_install_dir.patch'
         '0003_Fix_python_install_command.patch'
         '0004_Use_python2.patch'
-        'compiz-migrate-to-dconf.desktop')
-sha512sums=('05931a265ea47d3a977e1e419782bc84f1a833365100dad5a5ed68a97b803f5375a901e41ebf4538cd281edafc9559351f7dda09002a2716df6a820fd0ea9a00'
-            'e0e5f5b0bc63043e2a3afd5ff55c06debaddb4f90a31019f7aeaf32f195182f85f7d569c75b179ce00da66f0f7f2937aa6368f6fbf3e904791c89c10fefde9fb'
-            '7a97d46efde7d1cda2d1043998969aac509e453cd65ef9bb94a4edf91f71c3e6eb204b5e1729fa619bae77a2b9c949bf9e92b3d56bb7c5e791558e2d7961e154'
+        '0005_Disable_Werror.patch')
+sha512sums=('ff81ebcc50dfca5658909440039408461d3b071de89de40e92296c01d7fb78ea5aa313fd92231aaaf0c081ba6d189c0c0b65109cc3388077c9325f9fdd603460'
+            'f6276d5fd2aeed53d777ed60aec523df1416d86e94de211d95635f4faa2588045d3c359e48a56cfb4d3b155a0400deb715c3b4696d13be02ed3d49dc45417e24'
+            'a287d10d1261923a9aa5c672554ba43d73d9f4d9c04a95bd99b70fac686bbec9031fa406bc68ebf64c81eb4f0f5dec7672dcdaf4e605767ab99bc336a6fda188'
             'ba80a6e5c3a7b488974046f8c1b906bb178691a9224b5c8f3542e0948099e2291b8888fbd4f591eaa16f9209e7288f11e122d1673731e7f1aa7c84aa6e3207c6'
             'bd7c8c0bf4cb3767c5b4b6d9c2d79e958ff9f34375a8223b509aec16b3682e219568e17378fa392f6ca4267f695835d83ef1c5db12898ea7b7cc75e1151d02b2'
-            '037a30c8dcba1167a2aca7361d7bdc49095ce9c0710ccc6aae011367a867b775c0bdfc409b9e52ead908cbb7d94ad88de1501a5277779728d71410248870af16'
-            'affbff2a8ce7d5f223ce86407ef0e80769f9df47228b7acdf25d0ac82b70b80a9b0bce4507df928b9738ef69d1dc8ab3a3622094b2e765f89d54db2b10899cc8')
+            '8ee87a9de58d2ca4c9d64da24ff690dcce3f77aebbc45c6add5d6324b67862472ea7b6260e9019fe2a5ff0accf94e29bb7171cbd6f6982e973eecfeab564cfb3'
+            'c20c1e9b7cd44681c1fa76e6db3861f6ec7539d2047fe6be3be72d86d4d38c173f863f224a1111e36553b0ef38d5b1f0471e355785f6da041e7fb596e1940924')
 
 build() {
-  cd "${srcdir}/${pkgname%-*}-0.9.8.5"
+  cd "${srcdir}/compiz-${_actual_ver}${_extra_ver}"
 
   # Fix the directory for FindCompiz.cmake and FindCompizConfig.cmake
-  patch -Np1 -i "${srcdir}/0002_Fix_cmake_install_dir.patch"
+  patch -p1 -i "${srcdir}/0002_Fix_cmake_install_dir.patch"
 
   # Compiz's build system appends --install-layout=deb to the python 2 install
   # command (for python-compizconfig and ccsm) whether or not COMPIZ_DEB_BUILD
   # is set to 1
-  patch -Np1 -i "${srcdir}/0003_Fix_python_install_command.patch"
+  patch -p1 -i "${srcdir}/0003_Fix_python_install_command.patch"
 
   # Use python 2
-  patch -Np1 -i "${srcdir}/0004_Use_python2.patch"
+  patch -p1 -i "${srcdir}/0004_Use_python2.patch"
+
+  # Don't treat warnings as errors
+  patch -p1 -i "${srcdir}/0005_Disable_Werror.patch"
 
   # Apply Ubuntu patches
-  patch -Np1 -i "${srcdir}/${pkgname%-*}_${_actual_ver}+bzr${_bzr_rev}-${_ubuntu_rel}.diff"
+  patch -p1 -i "${srcdir}/compiz_${_actual_ver}${_extra_ver}-${_ubuntu_rel}.diff"
 
   for i in $(cat debian/patches/series | grep -v '#'); do
-    patch -Np1 -i "debian/patches/${i}"
+    patch -p1 -i "debian/patches/${i}"
   done
 
   # Disable '-Bsymbolic-functions' if present so libcompiz_core won't be
@@ -104,14 +87,18 @@ build() {
     -DCOMPIZ_DISABLE_GS_SCHEMAS_INSTALL=OFF \
     -DCOMPIZ_BUILD_TESTING=OFF \
     -DCOMPIZ_DISABLE_PLUGIN_KDE=ON \
-    -DUSE_KDE4=OFF
+    -DUSE_KDE4=OFF \
+    `# Necessary for new versions of Compiz` \
+    `# https://bugs.launchpad.net/compiz/+bug/1070211` \
+    -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
+    -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so
 
-  make -j1
+  make ${MAKEFLAGS}
 }
 
 package() {
-  cd "${srcdir}/${pkgname%-*}-0.9.8.5/build"
-  GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR="${pkgdir}"
+  cd "${srcdir}/compiz-${_actual_ver}${_extra_ver}/build"
+  make install DESTDIR="${pkgdir}"
 
   # Stupid findcompiz_install needs COMPIZ_DESTDIR and install needs DESTDIR
   #make findcompiz_install
@@ -176,13 +163,6 @@ package() {
   # Install script for resetting all of Compiz's settings
   install "${srcdir}/compiz.reset" "${pkgdir}/usr/bin/compiz.reset"
 
-  # Install script for migrating GConf settings to GSettings
-  install -dm755 "${pkgdir}/etc/xdg/autostart/"
-  install -m644 ../postinst/migration-scripts/02_migrate_to_gsettings.py \
-    "${pkgdir}/usr/lib/compiz/"
-  install -m644 "${srcdir}/compiz-migrate-to-dconf.desktop" \
-    "${pkgdir}/etc/xdg/autostart/"
-
   # Remove GConf schemas
   rm -rv "${pkgdir}/usr/share/gconf/"
 }

diff --git a/compiz-ubuntu/compare_versions.sh b/compiz-ubuntu/compare_versions.sh
@@ -3,6 +3,6 @@
 source "$(dirname ${0})/PKGBUILD"
 source "$(dirname ${0})/../version_checker.sh"
 
-echo -e "PKGBUILD version: ${_actual_ver}+bzr${_bzr_rev} ${_ubuntu_rel}"
+echo -e "PKGBUILD version: ${_actual_ver}${_extra_ver} ${_ubuntu_rel}"
 echo -e "Upstream version: $(get_launchpad_version compiz)"
 echo -e "Ubuntu version:   $(get_ubuntu_version compiz raring)"
diff --git a/compiz-ubuntu/compiz.reset b/compiz-ubuntu/compiz.reset
@@ -8,6 +8,7 @@ echo ""
 echo "This program will:"
 echo "  1. Switch to the metacity window manager"
 echo "  2. Remove Compiz's configuration directories"
+echo "  3. Reset Compiz's dconf/GSettings settings"
 echo
 read -p "Continue (y/N) " PROCEED
 
@@ -21,7 +22,7 @@ if [ "x${PROCEED}" == "xy" ] || [ "x${PROCEED}" == "xY" ]; then
 
   # Wait for Compiz to exit
   echo -n "Waiting for Compiz to exit..."
-  while $(pgrep compiz.bin &>/dev/null); do
+  while $(pgrep compiz &>/dev/null); do
     sleep 0.1
   done
   echo "DONE"
@@ -34,6 +35,10 @@ if [ "x${PROCEED}" == "xy" ] || [ "x${PROCEED}" == "xY" ]; then
   rm -rf ~/.config/compiz-1/
   echo "DONE"
 
+  echo -n "Resetting Compiz's dconf/GSettings settings..."
+  dconf reset -f /org/compiz/
+  echo "DONE"
+
   echo
   echo "Please log out and log back in. To log out, run:"
   echo "  gnome-session-quit --logout"