diff --git a/indicator-sound/0001_Not_a_phone.patch b/indicator-sound/0001_Not_a_phone.patch index 5ebe671e..8642bbb0 100644 --- a/indicator-sound/0001_Not_a_phone.patch +++ b/indicator-sound/0001_Not_a_phone.patch @@ -1,6 +1,27 @@ +From a41fc612e3977c6694bdb3ed6809bd3829d9d043 Mon Sep 17 00:00:00 2001 +From: Xiao-Long Chen +Date: Thu, 3 Apr 2014 22:50:40 -0400 +Subject: [PATCH] Not a phone + +--- + CMakeLists.txt | 2 -- + src/CMakeLists.txt | 1 - + src/service.vala | 1 - + vapi/url-dispatcher.vapi | 9 --------- + 4 files changed, 13 deletions(-) + delete mode 100644 vapi/url-dispatcher.vapi + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8c8d69c..694463e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -31,7 +31,6 @@ +@@ -25,13 +25,11 @@ set(SOURCE_BINARY_DIR "${CMAKE_BINARY_DIR}/src") + + set(PULSE_AUDIO_REQUIRED_VERSION 0.9.19) + set(GIO_2_0_REQUIRED_VERSION 2.25.13) +-set(URL_DISPATCHER_1_REQUIRED_VERSION 1) + + pkg_check_modules( PULSEAUDIO REQUIRED libpulse-mainloop-glib>=${PULSE_AUDIO_REQUIRED_VERSION} gio-unix-2.0>=${GIO_2_0_REQUIRED_VERSION} @@ -8,29 +29,35 @@ ) include_directories(${PULSEAUDIO_INCLUDE_DIRS}) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 98bc7c4..5db4baf 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -21,7 +21,6 @@ +@@ -33,7 +33,6 @@ vala_init(indicator-sound-service + --thread --vapidir=${CMAKE_SOURCE_DIR}/vapi/ --vapidir=. - --target-glib=2.36 - --pkg=url-dispatcher --pkg=bus-watcher ) +diff --git a/src/service.vala b/src/service.vala +index 4e02769..3643517 100644 --- a/src/service.vala +++ b/src/service.vala -@@ -134,7 +134,7 @@ +@@ -224,7 +224,6 @@ public class IndicatorSound.Service: Object { } void activate_phone_settings (SimpleAction action, Variant? param) { - UrlDispatch.send ("settings:///system/sound"); -+ //UrlDispatch.send ("settings:///system/sound"); } /* Returns a serialized version of @icon_name suited for the panel */ +diff --git a/vapi/url-dispatcher.vapi b/vapi/url-dispatcher.vapi +deleted file mode 100644 +index 88f7740..0000000 --- a/vapi/url-dispatcher.vapi -+++ b/vapi/url-dispatcher.vapi ++++ /dev/null @@ -1,9 +0,0 @@ -[CCode (cprefix="", lower_case_cprefix="", cheader_filename="liburl-dispatcher-1/url-dispatcher.h")] - @@ -41,3 +68,6 @@ - [CCode (cname = "url_dispatch_send")] - public static void send (string url, DispatchCallback? func = null); -} +-- +1.9.1 + diff --git a/indicator-sound/0002_Remove_tests.patch b/indicator-sound/0002_Remove_tests.patch index ef92bb78..5cac6efb 100644 --- a/indicator-sound/0002_Remove_tests.patch +++ b/indicator-sound/0002_Remove_tests.patch @@ -1,6 +1,30 @@ +From 52cc91f1f555224527038b80c1d61e722cd04aa0 Mon Sep 17 00:00:00 2001 +From: Xiao-Long Chen +Date: Thu, 3 Apr 2014 22:52:57 -0400 +Subject: [PATCH] Remove tests + +--- + CMakeLists.txt | 15 --------------- + 1 file changed, 15 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 694463e..d921b9a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -66,12 +66,3 @@ +@@ -45,12 +45,6 @@ pkg_check_modules( + ) + include_directories(${SOUNDSERVICE_INCLUDE_DIRS}) + +-pkg_check_modules( +- TEST REQUIRED +- dbustest-1 +-) +-include_directories(${TEST_INCLUDE_DIRS}) +- + find_package(Vala 0.20) + + find_package(GObjectIntrospection 0.9.12) +@@ -72,12 +66,3 @@ configure_file( add_subdirectory(data) add_subdirectory(src) @@ -13,3 +37,6 @@ - -add_subdirectory(tests) - +-- +1.9.1 + diff --git a/indicator-sound/PKGBUILD b/indicator-sound/PKGBUILD index 7e0a1d89..9e5783a8 100644 --- a/indicator-sound/PKGBUILD +++ b/indicator-sound/PKGBUILD @@ -4,10 +4,10 @@ pkgname=indicator-sound _actual_ver=12.10.2 -_extra_ver=+14.04.20140320 +_extra_ver=+14.04.20140401 _translations=20130418 -pkgver=${_actual_ver}daily14.03.20 -pkgrel=3 +pkgver=${_actual_ver}daily14.04.01 +pkgrel=1 pkgdesc="A unified sound menu" arch=('i686' 'x86_64') url="https://launchpad.net/indicator-sound" @@ -22,11 +22,11 @@ source=("https://launchpad.net/ubuntu/+archive/primary/+files/indicator-sound_${ 'com.ubuntu.sound.gschema.xml' '0001_Not_a_phone.patch' '0002_Remove_tests.patch') -sha512sums=('6d8d47ceb066bb9010d79e1ab489f7e4ae5cc777095525fcd1f2a188f399b37f5e448d4a3ba3615528d8a868e90d5dec847f571083aa71703cd805a95f63d8a1' +sha512sums=('73a3c1f2febf569e77118fd3cf7e2dcf9abef818f1829b4a07a1f843b6b39b41fa41d2d74dc8086c6a712a1fa2684faa57ef7a0aa9a5f9d7b782054cb8202513' '88578aab046cc6e87e015e414b21cf06ab51d26ee932e4213c4e532fd70f373fb03257c5d7b2bbcddbc852816dd1206b934ff9dc4d65dbac3325b382553230b0' '04e662c9724f983c0b9129e13394937541949d481de3722e72046a68a49772707a145854a09bc7830e10ddd9bcf3b3095c9101fbc0c29fd03cfd267a074aee3c' - '3ca63afb388afb5f32a5ad090db3cc50d40a48deb5bdf206cde6c92963481dcc244157560908613255801c2f09058111f66b6774216f5272f197371b64fd2ece' - '42f59923419ff5e9265f1737db21ff475fa92fcff045bbac646d0b7da799e190c4a91cdff506cb8053d633eec6a86d6a3c5d00e57de0977614e0d643bcbece2c') + '57649313d8bd5e053d95e52882039a39ac505ac26a90c9144fc18705fb618548c3c83aafb2a2fc89f6ed7539720811ffa0e9055566ad612f473b6a427e58ac4f' + '95235ea7e399cc88cfe0a682059fc2d3c3536e86f577d16141de8a2532b4236bd9881f1ccc5201b187977075ba1d99180a63e526968f571219f0d6e0573e449b') prepare() { cd "${srcdir}/${pkgname}-${_actual_ver}${_extra_ver}"