diff options
| author | Márcio Alexandre Silva Delgado <coadde@adinet.com.uy> | 2012-07-06 23:23:30 -0300 |
|---|---|---|
| committer | Márcio Alexandre Silva Delgado <coadde@adinet.com.uy> | 2012-07-06 23:23:30 -0300 |
| commit | 217dcabe7d6d536494dfc76d8062c038ee27475b (patch) | |
| tree | 98b96dc51ee5aa01e69bb0597d090462de0d4f42 | |
| parent | f2e6f3d3f65b4064fd1e4b19da9b11adcaa723ae (diff) | |
| parent | 7aea543dd03b90489a7310f27cec2ab0e437a937 (diff) | |
| download | abslibre-217dcabe7d6d536494dfc76d8062c038ee27475b.tar.gz abslibre-217dcabe7d6d536494dfc76d8062c038ee27475b.tar.bz2 abslibre-217dcabe7d6d536494dfc76d8062c038ee27475b.zip | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
| -rw-r--r-- | libre/clementine-libre/PKGBUILD | 7 | ||||
| -rw-r--r-- | libre/clementine-libre/clementine-1.0.1-global-menu.patch | 17 |
2 files changed, 1 insertions, 23 deletions
diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD index 4e3d4e536..d0a7e0d8d 100644 --- a/libre/clementine-libre/PKGBUILD +++ b/libre/clementine-libre/PKGBUILD @@ -8,7 +8,7 @@ _pkgname=clementine pkgname=clementine-libre pkgver=1.0.1 -pkgrel=5 +pkgrel=6 pkgdesc="A music player and library organizer, without spotify support" url="http://www.clementine-player.org/" license=('GPL') @@ -27,13 +27,11 @@ provides=("clementine=$pkgver") source=(http://clementine-player.googlecode.com/files/${_pkgname}-${pkgver}.tar.gz clementine-fix-albumcoverfetch-crash.patch clementine-fresh-start.patch - clementine-1.0.1-global-menu.patch remove-and-disable-spotify.patch remove-nonfree-references-on-translations.patch) sha1sums=('e05320da689e2fad744fd3e68518bc4103ecf0fd' 'fddd2e784181ce1dcc7809e7122cbade0af7b01f' 'd8abab4b8fb2d5284a2f43107505325e62d4af5f' - 'b716e4d43101fad535f93fd59034d7bbbb98cdb8' '2fef46eaffa7b5cd61afbf19b1dc909d11972a34' '745bc4fd639d7ef3230592c6275fb43b8956f3d5') install=clementine.install @@ -47,9 +45,6 @@ build() { # http://code.google.com/p/clementine-player/issues/detail?id=2752 patch -Np1 -i ../clementine-fix-albumcoverfetch-crash.patch - # FS#30549 - patch -Np1 -i ../clementine-1.0.1-global-menu.patch - # https://labs.parabola.nu/issues/99 patch -Np1 -i ../remove-and-disable-spotify.patch patch -Np1 -i ../remove-nonfree-references-on-translations.patch diff --git a/libre/clementine-libre/clementine-1.0.1-global-menu.patch b/libre/clementine-libre/clementine-1.0.1-global-menu.patch deleted file mode 100644 index 91f93e058..000000000 --- a/libre/clementine-libre/clementine-1.0.1-global-menu.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -Naur clementine-1.0.1.ori/src/main.cpp clementine-1.0.1/src/main.cpp ---- clementine-1.0.1.ori/src/main.cpp 2012-01-22 07:43:26.000000000 -0500 -+++ clementine-1.0.1/src/main.cpp 2012-07-05 13:58:49.040596906 -0400 -@@ -280,13 +280,6 @@ - UniversalEncodingHandler handler; - TagLib::ID3v1::Tag::setStringHandler(&handler); - --#ifdef Q_OS_LINUX -- // Force Clementine's menu to be shown in the Clementine window and not in -- // the Unity global menubar thing. See: -- // https://bugs.launchpad.net/unity/+bug/775278 -- setenv("QT_X11_NO_NATIVE_MENUBAR", "1", true); --#endif -- - // Initialise logging - logging::Init(); - logging::SetLevels(options.log_levels()); |