summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
Diffstat (limited to 'libre')
-rw-r--r--libre/clementine-libre/PKGBUILD20
-rw-r--r--libre/clementine-libre/moognu.pngbin0 -> 610 bytes
-rw-r--r--libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch (renamed from libre/clementine-libre/remove-and-disable-spotify.patch)63
-rw-r--r--libre/linux-libre-kmod-alx/PKGBUILD4
-rw-r--r--libre/linux-libre/PKGBUILD10
-rw-r--r--libre/linux-libre/linux-libre.install2
6 files changed, 78 insertions, 21 deletions
diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD
index 0daf90aec..f52891d3d 100644
--- a/libre/clementine-libre/PKGBUILD
+++ b/libre/clementine-libre/PKGBUILD
@@ -10,7 +10,7 @@ _pkgname=clementine
pkgname=clementine-libre
pkgver=1.1.1
pkgrel=8
-pkgdesc="A music player and library organizer, without spotify support"
+pkgdesc="A music player and library organizer, without nonfree artwork and spotify support"
url="http://www.clementine-player.org/"
license=('GPL')
arch=('i686' 'x86_64')
@@ -27,7 +27,8 @@ conflicts=('clementine')
provides=("clementine=$pkgver")
source=(http://clementine-player.googlecode.com/files/${_pkgname}-${pkgver}.tar.gz
'clementine-1.1.1-libimobiledevice-fix.patch'
- 'remove-and-disable-spotify.patch')
+ 'remove-nonfree-artwork-and-spotify.patch'
+ 'moognu.png')
install=clementine.install
build() {
@@ -35,18 +36,25 @@ build() {
patch -Np1 < "$srcdir"/clementine-1.1.1-libimobiledevice-fix.patch
- # Remove nonfree spotify references on files
- patch -Np1 -i ../remove-and-disable-spotify.patch
+ # Remove nonfree nonfree artwork and spotify references on files
+ patch -Np1 -i ../remove-nonfree-artwork-and-spotify.patch
# Remove nonfree spotifyblob folders
rm -rv ext/{clementine-spotifyblob,libclementine-spotifyblob}
# Remove nonfree spotify files
rm -v cmake/SpotifyVersion.cmake
+ rm -v data/spotify-core-logo-128x128.png
rm -v data/icons/svg/spotify.svg
rm -v data/schema/schema-30.sql
rm -v src/{globalsearch/spotifysearchprovider.{cpp,h},internet/spotify{blobdownloader.{cpp,h},server.{cpp,h},service.{cpp,h},settingspage.{cpp,h,ui}}}
+ ## Remove nonfree nyancat.png
+ rm -v data/nyancat.png
+
+ ## Put moognu.png to the source code
+ cp -v ../moognu.png data
+
# Create a blank file due that is a dependency for clementine
touch data/schema/schema-30.sql
@@ -59,4 +67,6 @@ package() {
make DESTDIR="${pkgdir}" install
}
md5sums=('28e4afb822388bd337a761db8f86febf'
- '736df6cd828a3172701f63c8dc978cb9')
+ '736df6cd828a3172701f63c8dc978cb9'
+ '5cc8f800dd4df7bd5548196009ab68e0'
+ '59a8c0d7659898c457b95f877718cf1c')
diff --git a/libre/clementine-libre/moognu.png b/libre/clementine-libre/moognu.png
new file mode 100644
index 000000000..177041886
--- /dev/null
+++ b/libre/clementine-libre/moognu.png
Binary files differ
diff --git a/libre/clementine-libre/remove-and-disable-spotify.patch b/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch
index a9352b275..6008b2d28 100644
--- a/libre/clementine-libre/remove-and-disable-spotify.patch
+++ b/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch
@@ -86,9 +86,9 @@ diff -rauN clementine-1.1.0/CMakeLists.txt clementine-libre-1.1.0/CMakeLists.txt
if(HAVE_MOODBAR)
add_subdirectory(gst/moodbar)
endif()
-diff -rauN clementine-1.1.0/data/data.qrc clementine-libre-1.1.0/data/data.qrc
---- clementine-1.1.0/data/data.qrc 2012-10-22 04:24:28.000000000 -0200
-+++ clementine-libre-1.1.0/data/data.qrc 2012-10-26 01:59:52.333078474 -0200
+diff -rauN clementine-1.1.1/data/data.qrc clementine-libre-1.1.1/data/data.qrc
+--- clementine-1.1.1/data/data.qrc 2012-11-18 06:51:26.000000000 -0200
++++ clementine-libre-1.1.1/data/data.qrc 2013-05-13 02:55:19.579440533 -0300
@@ -1,7 +1,6 @@
<RCC>
<qresource prefix="/">
@@ -121,7 +121,19 @@ diff -rauN clementine-1.1.0/data/data.qrc clementine-libre-1.1.0/data/data.qrc
<file>icons/48x48/view-choose.png</file>
<file>icons/48x48/view-fullscreen.png</file>
<file>icons/48x48/view-media-equalizer.png</file>
-@@ -339,7 +334,6 @@
+@@ -261,10 +257,10 @@
+ <file>lumberjacksong.txt</file>
+ <file>lyrics/ultimate_providers.xml</file>
+ <file>mainwindow.css</file>
++ <file>moognu.png</file>
+ <file>nocover.png</file>
+ <file>nomusic.png</file>
+ <file>now_playing_tooltip.txt</file>
+- <file>nyancat.png</file>
+ <file>osd_background.png</file>
+ <file>osd_shadow_corner.png</file>
+ <file>osd_shadow_edge.png</file>
+@@ -339,7 +335,6 @@
<file>smartplaylistsearchterm.css</file>
<file>songinfo.css</file>
<file>spinner.gif</file>
@@ -526,10 +538,14 @@ diff -rauN clementine-1.1.0/src/internet/internetmodel.cpp clementine-libre-1.1.
}
void InternetModel::AddService(InternetService *service) {
-diff -rauN clementine-1.0.1/src/ui/about.cpp clementine-libre-1.0.1/src/ui/about.cpp
---- clementine-1.0.1/src/ui/about.cpp 2012-01-22 10:43:26.000000000 -0200
-+++ clementine-libre-1.0.1/src/ui/about.cpp 2012-05-28 19:44:38.760244927 -0300
-@@ -79,12 +79,6 @@
+diff -rauN clementine-1.1.1/src/ui/about.cpp clementine-libre-1.1.1/src/ui/about.cpp
+--- clementine-1.1.1/src/ui/about.cpp 2012-10-11 09:16:40.000000000 -0200
++++ clementine-libre-1.1.1/src/ui/about.cpp 2013-05-13 02:19:40.262472593 -0300
+@@ -75,16 +75,9 @@
+
+ ret += QString("<br />%1</p>").arg(tr("...and all the Amarok contributors"));
+ ret += QString("<p><b>%1</b>").arg(tr("And:"));
+- ret += QString("<br /><a href=\"http://rainymood.com\">Rainy Mood</a>");
ret += QString("<br /><a href=\"http://www.smitelli.com/?page=blog&p=54\">Scott Smitelli</a>");
ret += QString("<br /><a href=\"http://hyperboleandahalf.blogspot.com\">Allie Brosh</a></p>");
@@ -621,3 +637,34 @@ diff -rauN clementine-1.0.1/src/core/timeconstants.h clementine-libre-1.0.1/src/
#ifndef TIMECONSTANTS_H
#define TIMECONSTANTS_H
+diff -rauN clementine-1.1.1/src/core/backgroundstreams.cpp clementine-libre-1.1.1/src/core/backgroundstreams.cpp
+--- clementine-1.1.1/src/core/backgroundstreams.cpp 2012-10-11 09:16:39.000000000 -0200
++++ clementine-libre-1.1.1/src/core/backgroundstreams.cpp 2013-05-13 02:20:21.506864034 -0300
+@@ -9,7 +9,6 @@
+
+ const char* BackgroundStreams::kSettingsGroup = "BackgroundStreams";
+ const char* BackgroundStreams::kHypnotoadUrl = "hypnotoad:///";
+-const char* BackgroundStreams::kRainUrl = "http://data.clementine-player.org/rainymood";
+ const char* BackgroundStreams::kEnterpriseUrl = "enterprise:///";
+
+ BackgroundStreams::BackgroundStreams(EngineBase* engine, QObject* parent)
+@@ -28,7 +27,6 @@
+ int version = s.value("version", 0).toInt();
+ if (version < 1) {
+ AddStream(QT_TR_NOOP("Hypnotoad"), QUrl(kHypnotoadUrl));
+- AddStream(QT_TR_NOOP("Rain"), QUrl(kRainUrl));
+ }
+
+ if (version < kVersion) {
+diff -rauN clementine-1.1.1/src/analyzers/nyancatanalyzer.cpp clementine-libre-1.1.1/src/analyzers/nyancatanalyzer.cpp
+--- clementine-1.1.1/src/analyzers/nyancatanalyzer.cpp 2012-10-16 08:17:37.000000000 -0200
++++ clementine-libre-1.1.1/src/analyzers/nyancatanalyzer.cpp 2013-05-13 03:56:04.732771832 -0300
+@@ -29,7 +29,7 @@
+
+ NyanCatAnalyzer::NyanCatAnalyzer(QWidget* parent)
+ : Analyzer::Base(parent, 9),
+- cat_(":/nyancat.png"),
++ cat_(":/moognu.png"),
+ timer_id_(startTimer(kFrameIntervalMs)),
+ frame_(0),
+ current_buffer_(0),
diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD
index 173af8d0a..4c1daea62 100644
--- a/libre/linux-libre-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-kmod-alx/PKGBUILD
@@ -1,12 +1,12 @@
# Maintainer: André Silva <emulatorman@lavabit.com>
-_kernver=3.9.1
+_kernver=3.9.2
_kernrel=1
pkgname=('linux-libre-kmod-alx')
_version=v3.9-rc4
_pkgver=3.9-rc4-2-su
pkgver=3.9rc4.2
-pkgrel=2
+pkgrel=3
pkgdesc='Atheros alx ethernet device driver for linux-libre kernel'
arch=('i686' 'x86_64')
url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx'
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 596cbbf4a..cf56e1f37 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 184768 2013-05-08 09:45:41Z tpowa $
+# $Id: PKGBUILD 185176 2013-05-11 19:40:40Z thomas $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Maintainer: Thomas Baechler <thomas@archlinux.org>
# Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
@@ -10,10 +10,10 @@
pkgbase=linux-libre # Build stock -LIBRE kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
_basekernel=3.9
-_sublevel=1
+_sublevel=2
pkgver=${_basekernel}.${_sublevel}
pkgrel=1
-_lxopkgver=${_basekernel}.0 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.2 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -31,7 +31,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'change-default-console-loglevel.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
md5sums=('120df29f88622dabf7015a22c7cc8e25'
- '72f23e5909202cf5124a2a3bedec3852'
+ '1a5e653d2c281cccef9b44340a94a866'
'9684934c48eb2c7bb7179b7e5b2c245f'
'd9ff747f6c2bd3a6e4a94a2abc4af9ca'
'e49ac236dfeef709f91a3d993ea7b62c'
@@ -39,7 +39,7 @@ md5sums=('120df29f88622dabf7015a22c7cc8e25'
'8267264d9a8966e57fdacd1fa1fc65c4'
'04b21c79df0a952c22d681dd4f4562df'
'f3def2cefdcbb954c21d8505d23cc83c'
- 'e7efe89395507569550103e0504232f8')
+ '2cc468726d0b215d45cbd28be6dee198')
if [ "$CARCH" != "mips64el" ]; then
# Don't use the Loongson-specific patches on non-mips64el arches.
unset source[${#source[@]}-1]
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index cef317042..f849635c1 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,7 +2,7 @@
# arg 2: the old package version
KERNEL_NAME=
-KERNEL_VERSION=3.9.1-1-LIBRE
+KERNEL_VERSION=3.9.2-1-LIBRE
# set a sane PATH to ensure that critical utils like depmod will be found
export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-23 03:44:21 +0000