mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-08 16:13:50 +02:00
Merge branch 'master' into testing
This commit is contained in:
Juan RP
commit
bd13ca4699
129 changed files with 12854 additions and 24930 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -2,3 +2,4 @@
|
|||
*.swp
|
||||
*~
|
||||
\#*#
|
||||
masterdir
|
||||
|
|
|
|||
|
|
@ -1037,7 +1037,6 @@ libvdemgmt.so.0 libvde2-2.3.2_1
|
|||
libvdehist.so.0 libvde2-2.3.2_1
|
||||
libsbc.so.1 sbc-1.0_1
|
||||
libecryptfs.so.0 libecryptfs-100_1
|
||||
libmuffin.so.0 libmuffin-1.0.6_1
|
||||
libnuma.so.1 libnuma-2.0.7_1
|
||||
libxar.so.1 xar-1.5.2_1
|
||||
libqpdf.so.8 libqpdf-3.0.1_1
|
||||
|
|
@ -1212,6 +1211,8 @@ librumpnet_sockin.so.0 netbsd-rumpkernel-20130321_1
|
|||
librumpnet_net.so.0 netbsd-rumpkernel-20130321_1
|
||||
librumpnet.so.0 netbsd-rumpkernel-20130321_1
|
||||
librumpkern_sys_linux.so.0 netbsd-rumpkernel-20130321_1
|
||||
librumpdev_netsmb.so.0 netbsd-rumpkernel-20130321_1
|
||||
librumpkern_crypto.so.0 netbsd-rumpkernel-20130321_1
|
||||
libdotconf.so.0 dotconf-1.3_1
|
||||
libspeechd.so.2 speech-dispatcher-0.8_1
|
||||
libre2.so.0 re2-20130115_1
|
||||
|
|
@ -1438,3 +1439,9 @@ libethumb_client.so.1 efl-1.8.1_1
|
|||
libethumb.so.1 efl-1.8.1_1
|
||||
libevas.so.1 efl-1.8.1_1
|
||||
libelementary.so.1 elementary-1.8.0_1
|
||||
libcjs.so.0 cjs-2.0.0_1
|
||||
libcjs-dbus.so.0 cjs-2.0.0_1
|
||||
libmuffin.so.0 muffin-2.0.5_1
|
||||
libcinnamon-desktop.so.4 cinnamon-desktop-2.0.4_1
|
||||
libcinnamon-control-center.so.1 cinnamon-control-center-2.0.9_1
|
||||
libnemo-extension.so.1 libnemo-2.0.8_1
|
||||
|
|
|
|||
|
|
@ -60,6 +60,21 @@ in a directory matching `$pkgname`, i.e: `xbps-packages/srcpkgs/foo/template`.
|
|||
If everything went fine after running `xbps-src build-pkg` a binary package
|
||||
called `foo-1.0_1.<arch>.xbps` will be generated in the local repository.
|
||||
|
||||
Additional binary packages (those defined in `_package() blocks` need a
|
||||
symlink to the `main` package, like this:
|
||||
|
||||
----------------------------------
|
||||
|
||||
/srcpkgs
|
||||
|- foo <- directory
|
||||
| |- template
|
||||
|- foo-devel <- symlink to `foo`
|
||||
|
||||
----------------------------------
|
||||
|
||||
Otherwise dependencies requiring those packages won't find its `template`
|
||||
file.
|
||||
|
||||
Package build phases
|
||||
--------------------
|
||||
Building a package consist of the following phases:
|
||||
|
|
@ -402,3 +417,32 @@ package is downloaded, compiled and installed.
|
|||
|
||||
NOTE: A function defined in a template has preference over the same function
|
||||
defined by a `build_style` script.
|
||||
|
||||
Contributing via git
|
||||
~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
You can fork the `xbps-packages` git repository on github and then set up
|
||||
a remote to pull in new changes:
|
||||
|
||||
----------------------------------------------------------------------
|
||||
$ git remote add upstream git://github.com/voidlinux/xbps-packages.git
|
||||
----------------------------------------------------------------------
|
||||
|
||||
To pull in new changes from `upstream`:
|
||||
|
||||
--------------------------
|
||||
$ git pull upstream master
|
||||
--------------------------
|
||||
|
||||
Once you've made changes to your `forked` repository you can submit
|
||||
a github pull request; see
|
||||
https://help.github.com/articles/fork-a-repo[github's help]
|
||||
for more information.
|
||||
|
||||
For commit messages please use the following rules:
|
||||
|
||||
- If you've imported a new package use `New package: <pkgver>`.
|
||||
- If you've updated a package use `<pkgname>: updated to <version>`.
|
||||
- If you've removed a package use `<pkgname>: removed ...`.
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# Template build file for 'MesaLib'.
|
||||
pkgname=MesaLib
|
||||
version=10.0.0
|
||||
revision=2
|
||||
version=10.0.1
|
||||
revision=1
|
||||
wrksrc="Mesa-${version}"
|
||||
build_style=gnu-configure
|
||||
configure_args="--enable-glx-tls --enable-shared-glapi --enable-gbm
|
||||
|
|
@ -15,8 +15,8 @@ short_desc="Graphics library similar to SGI's OpenGL"
|
|||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
homepage="http://www.mesa3d.org/"
|
||||
license="MIT, LGPL-2.1"
|
||||
distfiles="ftp://ftp.freedesktop.org/pub/mesa/${version%.*}/${pkgname}-${version}.tar.bz2"
|
||||
checksum=a36b9f58feb0688243a7bdd7e040173799c0280c9c47f1532206a874dd737102
|
||||
distfiles="ftp://ftp.freedesktop.org/pub/mesa/${version}/${pkgname}-${version}.tar.bz2"
|
||||
checksum=3cdf868f9599ca310c17fcf5b4ce9aec9903d8bf8561fde2577f3d422f823270
|
||||
|
||||
hostmakedepends="automake libtool flex pkg-config llvm>=3.3"
|
||||
makedepends="glproto dri2proto>=2.1 libXext-devel libXxf86vm-devel libXdamage-devel
|
||||
|
|
|
|||
|
|
@ -1,20 +1,21 @@
|
|||
# Template file for 'bitcoin'
|
||||
pkgname=bitcoin
|
||||
version=0.8.5
|
||||
revision=2
|
||||
version=0.8.6
|
||||
revision=1
|
||||
wrksrc="${pkgname}-${version}-linux"
|
||||
hostmakedepends="which"
|
||||
makedepends="db-devel>=5.3 openssl-devel qt-devel boost-devel>=1.54 automoc4 miniupnpc-devel"
|
||||
makedepends="db-devel>=5.3 openssl-devel boost-devel>=1.54 miniupnpc-devel"
|
||||
short_desc="Bitcoin is a peer-to-peer network based digital currency"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
license="MIT"
|
||||
homepage="http://www.bitcoin.org/"
|
||||
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-linux.tar.gz"
|
||||
checksum=84543f10de5e82ce6e88dd5a501db37c6327edf79a2a04f29199c24843e71f63
|
||||
checksum=73495de53d1a30676884961e39ff46c3851ff770eeaa767331d065ff0ce8dd0c
|
||||
|
||||
if [ "$CROSS_BUILD" ]; then
|
||||
if [ -z "$CROSS_BUILD" ]; then
|
||||
# XXX -qt subpkg
|
||||
makedepends="db-devel>=5.3 openssl-devel boost-devel miniupnpc-devel"
|
||||
hostmakedepends+=" automoc4"
|
||||
makedepends+=" qt-devel"
|
||||
fi
|
||||
|
||||
do_build() {
|
||||
|
|
|
|||
1
srcpkgs/bluez-cups
Symbolic link
1
srcpkgs/bluez-cups
Symbolic link
|
|
@ -0,0 +1 @@
|
|||
bluez
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'bluez'
|
||||
pkgname=bluez
|
||||
version=5.11
|
||||
version=5.12
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--with-udevdir=/usr/lib/udev
|
||||
|
|
@ -14,12 +14,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
|
|||
homepage="http://www.bluez.org/"
|
||||
license="GPL-2"
|
||||
distfiles="${KERNEL_SITE}/bluetooth/$pkgname-$version.tar.xz"
|
||||
checksum=1ee116dd504fcdc13dc4f1e171ae1e2a3c46395014cbab455fa12f092cceb06e
|
||||
long_desc="
|
||||
This package contains tools and system daemons for using Bluetooth devices.
|
||||
|
||||
BlueZ is the official Linux Bluetooth protocol stack. It is an Open Source
|
||||
project distributed under GNU General Public License (GPL)."
|
||||
checksum=75ef574f15f356d03bd54f1a8ba26abe63bf3d1326a9fa12d63a762ddf40617e
|
||||
|
||||
libbluetooth_package() {
|
||||
short_desc="Library to use the Bluez Linux Bluetooth Stack"
|
||||
|
|
@ -38,9 +33,18 @@ libbluetooth-devel_package() {
|
|||
}
|
||||
}
|
||||
|
||||
bluez-cups_package() {
|
||||
short_desc="CUPS printer backend for Bluetooth printers"
|
||||
pkg_install() {
|
||||
vmove usr/lib/cups/backend/bluetooth
|
||||
}
|
||||
}
|
||||
|
||||
bluez_package() {
|
||||
conf_files="/etc/bluetooth/main.conf"
|
||||
systemd_services="bluetooth.service true"
|
||||
pkg_install() {
|
||||
vmove all
|
||||
vinstall ${wrksrc}/src/main.conf 644 etc/bluetooth
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
# Template file for 'chroot-file'
|
||||
pkgname=chroot-file
|
||||
version=5.15
|
||||
version=5.16
|
||||
revision=1
|
||||
wrksrc="file-${version}"
|
||||
bootstrap=yes
|
||||
build_style=gnu-configure
|
||||
makedepends="zlib-devel"
|
||||
short_desc="File type identification utility -- for xbps-src use"
|
||||
|
|
@ -10,9 +11,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
|
|||
homepage="http://www.darwinsys.com/file/"
|
||||
license="BSD"
|
||||
distfiles="ftp://ftp.astron.com/pub/file/file-$version.tar.gz"
|
||||
checksum=4bd52cc614d6488127c0bddc208a2855481744d76ff0878d9c173d2a6ed564e4
|
||||
|
||||
bootstrap=yes
|
||||
checksum=48bcac7726c37a8a0bc7ffa16b58993575657dd7b382039380fb3b74ab389261
|
||||
|
||||
post_install() {
|
||||
rm -rf ${DESTDIR}/usr/share/man
|
||||
|
|
@ -20,8 +19,10 @@ post_install() {
|
|||
|
||||
chroot-file_package() {
|
||||
noverifyrdeps=yes
|
||||
conflicts="file>=0 file-devel>=0 libmagic>=0"
|
||||
provides="file-${version} file-devel-${version} libmagic-${version}"
|
||||
for f in file file-devel libmagic; do
|
||||
conflicts+="${f}>=0 "
|
||||
provides+="${f}-${version}_${revision} "
|
||||
done
|
||||
pkg_install() {
|
||||
vmove all
|
||||
}
|
||||
|
|
|
|||
1
srcpkgs/cinnamon-control-center-devel
Symbolic link
1
srcpkgs/cinnamon-control-center-devel
Symbolic link
|
|
@ -0,0 +1 @@
|
|||
cinnamon-control-center
|
||||
5313
srcpkgs/cinnamon-control-center/patches/region.patch
Normal file
5313
srcpkgs/cinnamon-control-center/patches/region.patch
Normal file
File diff suppressed because it is too large
Load diff
59
srcpkgs/cinnamon-control-center/template
Normal file
59
srcpkgs/cinnamon-control-center/template
Normal file
|
|
@ -0,0 +1,59 @@
|
|||
# Template file for 'cinnamon-control-center'
|
||||
pkgname=cinnamon-control-center
|
||||
version=2.0.9
|
||||
revision=1
|
||||
patch_args="-Np1"
|
||||
short_desc="The Cinnamon Control Center"
|
||||
build_style=gnu-configure
|
||||
configure_args=" --disable-static --disable-update-mimedb --enable-systemd"
|
||||
hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection
|
||||
gettext-devel intltool which xmlto docbook-xsl"
|
||||
makedepends="dbus-glib-devel gnome-menus-devel libgnomekbd-devel cinnamon-desktop-devel
|
||||
cinnamon-settings-daemon-devel systemd-devel network-manager-applet-devel libSM-devel
|
||||
libnotify-devel upower-devel polkit-devel colord-devel ibus-devel pulseaudio-devel
|
||||
libcanberra-devel cups-devel cheese-devel libXxf86misc-devel
|
||||
desktop-file-utils hicolor-icon-theme"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
license="GPL-3"
|
||||
homepage="http://cinnamon.linuxmint.com/"
|
||||
|
||||
do_fetch() {
|
||||
git clone -b ${version} git://github.com/linuxmint/${pkgname} ${pkgname}-${version}
|
||||
}
|
||||
|
||||
pre_configure() {
|
||||
NOCONFIGURE=1 ./autogen.sh
|
||||
}
|
||||
|
||||
post_install() {
|
||||
# Remove unused stuff
|
||||
make -C panels/sound DESTDIR="$DESTDIR" uninstall
|
||||
make -C panels/sound/data DESTDIR="$DESTDIR" install
|
||||
make -C shell DESTDIR="$DESTDIR" uninstall-binPROGRAMS uninstall-directoryDATA uninstall-uiDATA
|
||||
rm -R "$DESTDIR/usr/share/applications"
|
||||
rm -R "$DESTDIR/etc"
|
||||
}
|
||||
|
||||
libcinnamon-control-center_package() {
|
||||
short_desc+=" - runtime library"
|
||||
pkg_install() {
|
||||
vmove "usr/lib/*.so.*"
|
||||
}
|
||||
}
|
||||
|
||||
cinnamon-control-center-devel_package() {
|
||||
short_desc+=" - development files"
|
||||
depends="libglib-devel gtk+3-devel lib${sourcepkg}>=${version}_${revision}"
|
||||
pkg_install() {
|
||||
vmove usr/include
|
||||
vmove usr/lib/pkgconfig
|
||||
vmove "usr/lib/*.so"
|
||||
}
|
||||
}
|
||||
|
||||
cinnamon-control-center_package() {
|
||||
depends="cinnamon-settings-daemon cinnamon-translations desktop-file-utils hicolor-icon-theme"
|
||||
pkg_install() {
|
||||
vmove all
|
||||
}
|
||||
}
|
||||
1
srcpkgs/cinnamon-desktop-devel
Symbolic link
1
srcpkgs/cinnamon-desktop-devel
Symbolic link
|
|
@ -0,0 +1 @@
|
|||
cinnamon-desktop
|
||||
40
srcpkgs/cinnamon-desktop/template
Normal file
40
srcpkgs/cinnamon-desktop/template
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
# Template file for 'cinnamon-desktop'
|
||||
pkgname=cinnamon-desktop
|
||||
version=2.0.4
|
||||
revision=2
|
||||
short_desc="Library with common API for various Cinnamon modules"
|
||||
build_style=gnu-configure
|
||||
configure_args=" --disable-static"
|
||||
hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection
|
||||
gettext-devel intltool which"
|
||||
makedepends="gdk-pixbuf-devel gtk+3-devel libXrandr-devel xkeyboard-config libxkbfile-devel "
|
||||
maintainer="Roelof Wobben <rwobben@hotmail.com>"
|
||||
license="GPL-3"
|
||||
homepage="http://cinnamon.linuxmint.com/"
|
||||
|
||||
do_fetch() {
|
||||
git clone -b ${version} git://github.com/linuxmint/${pkgname} ${pkgname}-${version}
|
||||
}
|
||||
|
||||
pre_configure() {
|
||||
./autogen.sh
|
||||
}
|
||||
|
||||
cinnamon-desktop-devel_package() {
|
||||
depends="gtk+3-devel libxkbfile-devel ${sourcepkg}>=${version}_${revision}"
|
||||
short_desc+=" - development files"
|
||||
pkg_install() {
|
||||
vmove "usr/lib/*.so"
|
||||
vmove usr/include
|
||||
vmove usr/lib/pkgconfig
|
||||
vmove usr/share/gir-1.0
|
||||
}
|
||||
}
|
||||
|
||||
cinnamon-desktop_package() {
|
||||
depends="xkeyboard-config"
|
||||
pkg_install() {
|
||||
vmove all
|
||||
}
|
||||
}
|
||||
|
||||
11
srcpkgs/cinnamon-screensaver/files/cinnamon-screensaver.pam
Normal file
11
srcpkgs/cinnamon-screensaver/files/cinnamon-screensaver.pam
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
#%PAM-1.0
|
||||
auth requisite pam_nologin.so
|
||||
auth required pam_env.so
|
||||
auth required pam_unix.so
|
||||
auth optional pam_gnome_keyring.so
|
||||
account required pam_unix.so
|
||||
session required pam_unix.so
|
||||
session optional pam_gnome_keyring.so auto_start
|
||||
session optional pam_systemd.so
|
||||
session required pam_limits.so
|
||||
password required pam_unix.so
|
||||
226
srcpkgs/cinnamon-screensaver/patches/away-message-fixes.patch
Normal file
226
srcpkgs/cinnamon-screensaver/patches/away-message-fixes.patch
Normal file
|
|
@ -0,0 +1,226 @@
|
|||
diff -Naur cinnamon-screensaver-2.0.3.orig/doc/dbus-interface.html cinnamon-screensaver-2.0.3/doc/dbus-interface.html
|
||||
--- cinnamon-screensaver-2.0.3.orig/doc/dbus-interface.html 2013-10-26 19:34:39.000000000 +0200
|
||||
+++ cinnamon-screensaver-2.0.3/doc/dbus-interface.html 2013-10-29 10:08:06.568038245 +0100
|
||||
@@ -70,7 +70,7 @@
|
||||
<code class="literal">Lock</code>
|
||||
</h3></div></div></div><p>
|
||||
Request that the screen be locked.
|
||||
- </p></div><div class="sect2" title="Cycle"><div class="titlepage"><div><div><h3 class="title"><a name="gs-method-Cycle"></a>
|
||||
+ </p><div class="informaltable"><table border="1"><colgroup><col><col></colgroup><thead><tr><th>Direction</th><th>Type</th><th>Description</th></tr></thead><tbody><tr><td>in</td><td>string</td><td>the away message</td></tr></tbody></table></div></div><div class="sect2" title="Cycle"><div class="titlepage"><div><div><h3 class="title"><a name="gs-method-Cycle"></a>
|
||||
<code class="literal">Cycle</code>
|
||||
</h3></div></div></div><p>
|
||||
Request that the screen saver theme be restarted and, if applicable,
|
||||
diff -Naur cinnamon-screensaver-2.0.3.orig/src/cinnamon-screensaver-command.c cinnamon-screensaver-2.0.3/src/cinnamon-screensaver-command.c
|
||||
--- cinnamon-screensaver-2.0.3.orig/src/cinnamon-screensaver-command.c 2013-10-26 19:34:39.000000000 +0200
|
||||
+++ cinnamon-screensaver-2.0.3/src/cinnamon-screensaver-command.c 2013-10-29 22:32:13.127650887 +0100
|
||||
@@ -41,7 +41,7 @@
|
||||
static gboolean do_query = FALSE;
|
||||
static gboolean do_time = FALSE;
|
||||
|
||||
-static gchar *away_message = "DEFAULT";
|
||||
+static gchar *away_message = "";
|
||||
|
||||
static GOptionEntry entries [] = {
|
||||
{ "exit", 0, 0, G_OPTION_ARG_NONE, &do_quit,
|
||||
@@ -114,7 +114,7 @@
|
||||
static GDBusMessage *
|
||||
screensaver_send_message_string (GDBusConnection *connection,
|
||||
const char *name,
|
||||
- gboolean value)
|
||||
+ gchar *value)
|
||||
{
|
||||
GDBusMessage *message, *reply;
|
||||
GError *error;
|
||||
@@ -310,14 +310,7 @@
|
||||
}
|
||||
|
||||
if (do_lock) {
|
||||
- if (g_strcmp0 (away_message, "DEFAULT") == 0) {
|
||||
- reply = screensaver_send_message_string (connection, "Lock", away_message);
|
||||
- }
|
||||
- else {
|
||||
- gchar * custom_message = g_strdup_printf("CUSTOM###%s", away_message);
|
||||
- reply = screensaver_send_message_string (connection, "Lock", custom_message);
|
||||
- g_free (custom_message);
|
||||
- }
|
||||
+ reply = screensaver_send_message_string (connection, "Lock", away_message);
|
||||
if (reply == NULL) {
|
||||
g_message ("Did not receive a reply from the screensaver.");
|
||||
goto done;
|
||||
diff -Naur cinnamon-screensaver-2.0.3.orig/src/cinnamon-screensaver-dialog.c cinnamon-screensaver-2.0.3/src/cinnamon-screensaver-dialog.c
|
||||
--- cinnamon-screensaver-2.0.3.orig/src/cinnamon-screensaver-dialog.c 2013-10-26 19:34:39.000000000 +0200
|
||||
+++ cinnamon-screensaver-2.0.3/src/cinnamon-screensaver-dialog.c 2013-10-29 18:34:38.042752214 +0100
|
||||
@@ -49,7 +49,6 @@
|
||||
static gboolean enable_logout = FALSE;
|
||||
static gboolean enable_switch = FALSE;
|
||||
static char *logout_command = NULL;
|
||||
-static char *away_message = NULL;
|
||||
|
||||
static GOptionEntry entries [] = {
|
||||
{ "verbose", 0, 0, G_OPTION_ARG_NONE, &verbose,
|
||||
diff -Naur cinnamon-screensaver-2.0.3.orig/src/gs-listener-dbus.c cinnamon-screensaver-2.0.3/src/gs-listener-dbus.c
|
||||
--- cinnamon-screensaver-2.0.3.orig/src/gs-listener-dbus.c 2013-10-26 19:34:39.000000000 +0200
|
||||
+++ cinnamon-screensaver-2.0.3/src/gs-listener-dbus.c 2013-10-30 03:04:42.134732524 +0100
|
||||
@@ -570,7 +570,7 @@
|
||||
if (! dbus_message_get_args (message, &error,
|
||||
DBUS_TYPE_STRING, &body,
|
||||
DBUS_TYPE_INVALID)) {
|
||||
- raise_syntax (connection, message, "ShowMessage");
|
||||
+ raise_syntax (connection, message, "Lock");
|
||||
return DBUS_HANDLER_RESULT_HANDLED;
|
||||
}
|
||||
|
||||
@@ -584,6 +584,7 @@
|
||||
|
||||
return DBUS_HANDLER_RESULT_HANDLED;
|
||||
}
|
||||
+
|
||||
static DBusHandlerResult
|
||||
listener_show_message (GSListener *listener,
|
||||
DBusConnection *connection,
|
||||
@@ -906,7 +907,7 @@
|
||||
} else if (dbus_message_is_signal (message, SYSTEMD_LOGIND_SESSION_INTERFACE, "Lock")) {
|
||||
if (_listener_message_path_is_our_session (listener, message)) {
|
||||
gs_debug ("systemd requested session lock");
|
||||
- return listener_lock (listener, connection, message);
|
||||
+ g_signal_emit (listener, signals [LOCK], 0, "");
|
||||
}
|
||||
|
||||
return DBUS_HANDLER_RESULT_HANDLED;
|
||||
@@ -948,7 +949,7 @@
|
||||
} else if (dbus_message_is_signal (message, CK_SESSION_INTERFACE, "Lock")) {
|
||||
if (_listener_message_path_is_our_session (listener, message)) {
|
||||
gs_debug ("ConsoleKit requested session lock");
|
||||
- return listener_lock (listener, connection, message);
|
||||
+ g_signal_emit (listener, signals [LOCK], 0, "");
|
||||
}
|
||||
|
||||
return DBUS_HANDLER_RESULT_HANDLED;
|
||||
diff -Naur cinnamon-screensaver-2.0.3.orig/src/gs-manager.c cinnamon-screensaver-2.0.3/src/gs-manager.c
|
||||
--- cinnamon-screensaver-2.0.3.orig/src/gs-manager.c 2013-10-26 19:34:39.000000000 +0200
|
||||
+++ cinnamon-screensaver-2.0.3/src/gs-manager.c 2013-10-29 20:27:40.394604570 +0100
|
||||
@@ -1097,6 +1097,7 @@
|
||||
g_object_unref (manager->priv->settings);
|
||||
}
|
||||
|
||||
+ g_free (manager->priv->away_message);
|
||||
g_free (manager->priv->logout_command);
|
||||
g_free (manager->priv->keyboard_command);
|
||||
|
||||
@@ -1261,6 +1262,8 @@
|
||||
|
||||
gs_manager_destroy_windows (manager);
|
||||
|
||||
+ gs_manager_set_away_message (manager, NULL);
|
||||
+
|
||||
/* reset state */
|
||||
manager->priv->active = FALSE;
|
||||
manager->priv->activate_time = 0;
|
||||
@@ -1275,10 +1278,18 @@
|
||||
gs_manager_set_away_message (GSManager *manager,
|
||||
const char *message)
|
||||
{
|
||||
- g_free (manager->priv->logout_command);
|
||||
-
|
||||
- manager->priv->away_message = g_strdup(message);
|
||||
GSList *l;
|
||||
+
|
||||
+ g_return_if_fail (GS_IS_MANAGER (manager));
|
||||
+
|
||||
+ g_free (manager->priv->away_message);
|
||||
+
|
||||
+ if (message) {
|
||||
+ manager->priv->away_message = g_strdup (message);
|
||||
+ } else {
|
||||
+ manager->priv->away_message = NULL;
|
||||
+ }
|
||||
+
|
||||
for (l = manager->priv->windows; l; l = l->next) {
|
||||
gs_window_set_away_message (l->data, manager->priv->away_message);
|
||||
}
|
||||
@@ -1293,7 +1304,6 @@
|
||||
if (active) {
|
||||
res = gs_manager_activate (manager);
|
||||
} else {
|
||||
- gs_manager_set_away_message(manager, "");
|
||||
res = gs_manager_deactivate (manager);
|
||||
}
|
||||
|
||||
diff -Naur cinnamon-screensaver-2.0.3.orig/src/gs-window-x11.c cinnamon-screensaver-2.0.3/src/gs-window-x11.c
|
||||
--- cinnamon-screensaver-2.0.3.orig/src/gs-window-x11.c 2013-10-26 19:34:39.000000000 +0200
|
||||
+++ cinnamon-screensaver-2.0.3/src/gs-window-x11.c 2013-10-29 23:11:15.240828725 +0100
|
||||
@@ -2132,38 +2132,19 @@
|
||||
return utf8_name;
|
||||
}
|
||||
|
||||
-static gchar *
|
||||
-str_replace(const char *string, const char *delimiter, const char *replacement)
|
||||
-{
|
||||
- gchar **split;
|
||||
- gchar *ret;
|
||||
- g_return_val_if_fail(string != NULL, NULL);
|
||||
- g_return_val_if_fail(delimiter != NULL, NULL);
|
||||
- g_return_val_if_fail(replacement != NULL, NULL);
|
||||
- split = g_strsplit(string, delimiter, 0);
|
||||
- ret = g_strjoinv(replacement, split);
|
||||
- g_strfreev(split);
|
||||
- return ret;
|
||||
-}
|
||||
-
|
||||
static void
|
||||
update_clock (GSWindow *window)
|
||||
{
|
||||
- char *markup;
|
||||
- char *away_message;
|
||||
-
|
||||
- if (window->priv->away_message != NULL && g_str_has_prefix (window->priv->away_message, "CUSTOM###") && g_strcmp0(window->priv->away_message, "") != 0) {
|
||||
- away_message = str_replace(window->priv->away_message, "CUSTOM###", "");
|
||||
- markup = g_strdup_printf ("%s\n\n<b><span font_desc=\"Ubuntu 14\" foreground=\"#CCCCCC\"> %s</span></b>\n<b><span font_desc=\"Ubuntu 10\" foreground=\"#ACACAC\"> ~ %s</span></b>", gnome_wall_clock_get_clock (window->priv->clock_tracker), away_message, get_user_display_name());
|
||||
- }
|
||||
- else {
|
||||
- away_message = g_strdup_printf (_("%s"), window->priv->default_message);
|
||||
- markup = g_strdup_printf ("%s\n\n<b><span font_desc=\"Ubuntu 14\" foreground=\"#CCCCCC\">%s</span></b>", gnome_wall_clock_get_clock (window->priv->clock_tracker), away_message);
|
||||
- }
|
||||
-
|
||||
- gtk_label_set_markup (GTK_LABEL (window->priv->clock), markup);
|
||||
- g_free (markup);
|
||||
- g_free (away_message);
|
||||
+ char *markup;
|
||||
+
|
||||
+ if (window->priv->away_message != NULL && g_strcmp0(window->priv->away_message, "") != 0) {
|
||||
+ markup = g_strdup_printf ("%s\n\n<b><span font_desc=\"Ubuntu 14\" foreground=\"#CCCCCC\"> %s</span></b>\n<b><span font_desc=\"Ubuntu 10\" foreground=\"#ACACAC\"> ~ %s</span></b>", gnome_wall_clock_get_clock (window->priv->clock_tracker), g_markup_escape_text(window->priv->away_message, -1), get_user_display_name());
|
||||
+ } else {
|
||||
+ markup = g_strdup_printf ("%s\n\n<b><span font_desc=\"Ubuntu 14\" foreground=\"#CCCCCC\">%s</span></b>", gnome_wall_clock_get_clock (window->priv->clock_tracker), g_markup_escape_text(window->priv->default_message, -1));
|
||||
+ }
|
||||
+
|
||||
+ gtk_label_set_markup (GTK_LABEL (window->priv->clock), markup);
|
||||
+ g_free (markup);
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -2197,7 +2178,16 @@
|
||||
gs_window_set_away_message (GSWindow *window,
|
||||
const char *message)
|
||||
{
|
||||
- window->priv->away_message = message;
|
||||
+ g_return_if_fail (GS_IS_WINDOW (window));
|
||||
+
|
||||
+ g_free (window->priv->away_message);
|
||||
+
|
||||
+ if (message) {
|
||||
+ window->priv->away_message = g_strdup (message);
|
||||
+ } else {
|
||||
+ window->priv->away_message = NULL;
|
||||
+ }
|
||||
+
|
||||
update_clock (window);
|
||||
}
|
||||
|
||||
@@ -2320,6 +2310,7 @@
|
||||
|
||||
g_return_if_fail (window->priv != NULL);
|
||||
|
||||
+ g_free (window->priv->away_message);
|
||||
g_free (window->priv->logout_command);
|
||||
g_free (window->priv->keyboard_command);
|
||||
|
||||
83
srcpkgs/cinnamon-screensaver/patches/fix-systemd-lock.patch
Normal file
83
srcpkgs/cinnamon-screensaver/patches/fix-systemd-lock.patch
Normal file
|
|
@ -0,0 +1,83 @@
|
|||
From cac2c0ad8f4f40b6b175b9fbcde06935859f1bbc Mon Sep 17 00:00:00 2001
|
||||
From: Peter de Ridder <peter@xfce.org>
|
||||
Date: Wed, 20 Mar 2013 20:44:51 +0100
|
||||
Subject: [PATCH] Use the session path instead of the session id.
|
||||
|
||||
---
|
||||
src/gs-listener-dbus.c | 47 +++++++++++++++++++++++++++--------------------
|
||||
1 file changed, 27 insertions(+), 20 deletions(-)
|
||||
|
||||
diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c
|
||||
index 703d9e1..11fb95e 100644
|
||||
--- a/src/gs-listener-dbus.c
|
||||
+++ b/src/gs-listener-dbus.c
|
||||
@@ -116,19 +117,8 @@ enum {
|
||||
if (listener->priv->session_id == NULL)
|
||||
return FALSE;
|
||||
|
||||
-#ifdef WITH_SYSTEMD
|
||||
- /* The bus object path is simply the actual session ID
|
||||
- * prefixed to make it a bus path */
|
||||
- if (listener->priv->have_systemd)
|
||||
- return g_str_has_prefix (ssid, SYSTEMD_LOGIND_SESSION_PATH "/")
|
||||
- && strcmp (ssid + sizeof (SYSTEMD_LOGIND_SESSION_PATH),
|
||||
- listener->priv->session_id) == 0;
|
||||
-#endif
|
||||
-
|
||||
-#ifdef WITH_CONSOLE_KIT
|
||||
if (strcmp (ssid, listener->priv->session_id) == 0)
|
||||
return TRUE;
|
||||
-#endif
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
@@ -416,20 +406,37 @@ enum {
|
||||
|
||||
#ifdef WITH_SYSTEMD
|
||||
if (listener->priv->have_systemd) {
|
||||
- char *t;
|
||||
- int r;
|
||||
+ dbus_uint32_t pid = getpid();
|
||||
|
||||
- r = sd_pid_get_session (0, &t);
|
||||
- if (r < 0) {
|
||||
- gs_debug ("Couldn't determine our own session id: %s", strerror (-r));
|
||||
+ message = dbus_message_new_method_call (SYSTEMD_LOGIND_SERVICE, SYSTEMD_LOGIND_PATH, SYSTEMD_LOGIND_INTERFACE, "GetSessionByPID");
|
||||
+ if (message == NULL) {
|
||||
+ gs_debug ("Couldn't allocate the dbus message");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
- /* t is allocated with malloc(), we need it with g_malloc() */
|
||||
- ssid = g_strdup(t);
|
||||
- free (t);
|
||||
+ if (dbus_message_append_args (message, DBUS_TYPE_UINT32, &pid, DBUS_TYPE_INVALID) == FALSE) {
|
||||
+ gs_debug ("Couldn't add args to the dbus message");
|
||||
+ return NULL;
|
||||
+ }
|
||||
+
|
||||
+ /* FIXME: use async? */
|
||||
+ reply = dbus_connection_send_with_reply_and_block (listener->priv->system_connection,
|
||||
+ message,
|
||||
+ -1, &error);
|
||||
+ dbus_message_unref (message);
|
||||
+
|
||||
+ if (dbus_error_is_set (&error)) {
|
||||
+ gs_debug ("%s raised:\n %s\n\n", error.name, error.message);
|
||||
+ dbus_error_free (&error);
|
||||
+ return NULL;
|
||||
+ }
|
||||
+
|
||||
+ dbus_message_iter_init (reply, &reply_iter);
|
||||
+ dbus_message_iter_get_basic (&reply_iter, &ssid);
|
||||
+
|
||||
+ dbus_message_unref (reply);
|
||||
|
||||
- return ssid;
|
||||
+ return g_strdup (ssid);
|
||||
}
|
||||
#endif
|
||||
|
||||
--
|
||||
1.8.4
|
||||
|
||||
|
|
@ -0,0 +1,51 @@
|
|||
From f8f9beb6a3bf81240d36bfec43e5db9b102ea91e Mon Sep 17 00:00:00 2001
|
||||
From: Martin Pitt <martinpitt@gnome.org>
|
||||
Date: Wed, 1 May 2013 10:55:49 -0700
|
||||
Subject: [PATCH] Lock screen on suspend
|
||||
|
||||
Listen for logind's PrepareForSleep signal, and lock the screen (if configured
|
||||
to do so). This mirrors what gnome-shell's screensaver does.
|
||||
---
|
||||
src/gs-listener-dbus.c | 28 ++++++++++++++++++++++++++++
|
||||
src/gs-listener-dbus.h | 1 +
|
||||
src/gs-monitor.c | 20 ++++++++++++++++++++
|
||||
3 files changed, 49 insertions(+)
|
||||
|
||||
diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c
|
||||
index 7f718fa..49586fd 100644
|
||||
--- a/src/gs-listener-dbus.c
|
||||
+++ b/src/gs-listener-dbus.c
|
||||
@@ -871,6 +872,17 @@ listener_dbus_handle_system_message (DBusConnection *connection,
|
||||
}
|
||||
|
||||
return DBUS_HANDLER_RESULT_HANDLED;
|
||||
+ } else if (dbus_message_is_signal (message, SYSTEMD_LOGIND_INTERFACE, "PrepareForSleep")) {
|
||||
+ gboolean active;
|
||||
+ if (dbus_message_get_args (message, NULL,
|
||||
+ DBUS_TYPE_BOOLEAN, &active,
|
||||
+ DBUS_TYPE_INVALID) && active) {
|
||||
+ gs_debug ("systemd notified that system is about to sleep");
|
||||
+ g_signal_emit (listener, signals [LOCK], 0, "");
|
||||
+ } else {
|
||||
+ gs_debug ("cannot parse PrepareForSleep");
|
||||
+ }
|
||||
+ return DBUS_HANDLER_RESULT_HANDLED;
|
||||
} else if (dbus_message_is_signal (message, DBUS_INTERFACE_PROPERTIES, "PropertiesChanged")) {
|
||||
|
||||
if (_listener_message_path_is_our_session (listener, message)) {
|
||||
@@ -1370,6 +1392,12 @@ gs_listener_acquire (GSListener *listener,
|
||||
",interface='"DBUS_INTERFACE_PROPERTIES"'"
|
||||
",member='PropertiesChanged'",
|
||||
NULL);
|
||||
+ dbus_bus_add_match (listener->priv->system_connection,
|
||||
+ "type='signal'"
|
||||
+ ",sender='"SYSTEMD_LOGIND_SERVICE"'"
|
||||
+ ",interface='"SYSTEMD_LOGIND_INTERFACE"'"
|
||||
+ ",member='PrepareForSleep'",
|
||||
+ NULL);
|
||||
|
||||
return (res != -1);
|
||||
}
|
||||
--
|
||||
1.8.1.2
|
||||
|
||||
36
srcpkgs/cinnamon-screensaver/template
Normal file
36
srcpkgs/cinnamon-screensaver/template
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
# Template file for 'cinnamon-screensaver'
|
||||
pkgname=cinnamon-screensaver
|
||||
version=2.0.3
|
||||
revision=1
|
||||
patch_args="-Np1"
|
||||
short_desc="The Cinnamon screensaver"
|
||||
build_style=gnu-configure
|
||||
configure_args=" --disable-static --disable-schemas-compile
|
||||
--enable-systemd --with-mit-ext"
|
||||
hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection
|
||||
gettext-devel intltool which"
|
||||
makedepends="dbus-glib-devel libgnomekbd-devel cinnamon-desktop-devel
|
||||
libXxf86misc-devel pam-devel systemd-devel desktop-file-utils hicolor-icon-theme"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
license="GPL-3"
|
||||
homepage="http://cinnamon.linuxmint.com/"
|
||||
|
||||
do_fetch() {
|
||||
git clone -b ${version} git://github.com/linuxmint/${pkgname} ${pkgname}-${version}
|
||||
}
|
||||
|
||||
pre_configure() {
|
||||
NOCONFIGURE=1 ./autogen.sh
|
||||
}
|
||||
|
||||
post_install() {
|
||||
vinstall ${FILESDIR}/${pkgname}.pam 644 etc/pam.d ${pkgname}
|
||||
}
|
||||
|
||||
cinnamon-screensaver_package() {
|
||||
depends="cinnamon-translations desktop-file-utils hicolor-icon-theme"
|
||||
conf_files="/etc/pam.d/${pkgname}"
|
||||
pkg_install() {
|
||||
vmove all
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
--- cinnamon-session/csm-session-fill.c
|
||||
+++ cinnamon-session/csm-session-fill.c
|
||||
@@ -228,15 +228,6 @@
|
||||
load_standard_apps (CsmManager *manager,
|
||||
GKeyFile *keyfile)
|
||||
{
|
||||
- GError *error;
|
||||
-
|
||||
- g_debug ("fill: *** Executing user migration");
|
||||
- error = NULL;
|
||||
- if(!g_spawn_command_line_sync ("session-migration", NULL, NULL, NULL, &error)) {
|
||||
- g_warning ("Error while executing session-migration: %s", error->message);
|
||||
- g_error_free (error);
|
||||
- }
|
||||
-
|
||||
g_debug ("fill: *** Adding required components");
|
||||
handle_required_components (keyfile, !csm_manager_get_failsafe (manager),
|
||||
append_required_components_helper, manager);
|
||||
22
srcpkgs/cinnamon-session/patches/timeout.patch
Normal file
22
srcpkgs/cinnamon-session/patches/timeout.patch
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
--- cinnamon-session/csm-session-fill.c 2012-02-02 15:33:01.000000000 +0100
|
||||
+++ cinnamon-session/csm-session-fill.c 2012-06-10 02:39:46.184348462 +0200
|
||||
@@ -36,7 +36,7 @@
|
||||
#define CSM_KEYFILE_DEFAULT_PROVIDER_PREFIX "DefaultProvider"
|
||||
|
||||
/* See https://bugzilla.gnome.org/show_bug.cgi?id=641992 for discussion */
|
||||
-#define CSM_RUNNABLE_HELPER_TIMEOUT 3000 /* ms */
|
||||
+#define CSM_RUNNABLE_HELPER_TIMEOUT 10000 /* ms */
|
||||
|
||||
typedef void (*GsmFillHandleProvider) (const char *provides,
|
||||
const char *default_provider,
|
||||
--- tools/cinnamon-session-check-accelerated.c 2011-03-22 21:31:43.000000000 +0100
|
||||
+++ tools/cinnamon-session-check-accelerated.c 2012-06-10 02:42:08.013218006 +0200
|
||||
@@ -30,7 +30,7 @@
|
||||
#include <X11/Xatom.h>
|
||||
|
||||
/* Wait up to this long for a running check to finish */
|
||||
-#define PROPERTY_CHANGE_TIMEOUT 5000
|
||||
+#define PROPERTY_CHANGE_TIMEOUT 12000
|
||||
|
||||
/* Values used for the _GNOME_SESSION_ACCELERATED root window property */
|
||||
#define NO_ACCEL 0
|
||||
31
srcpkgs/cinnamon-session/template
Normal file
31
srcpkgs/cinnamon-session/template
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
# Template file for 'cinnamon-session'
|
||||
pkgname=cinnamon-session
|
||||
version=2.0.6
|
||||
revision=1
|
||||
short_desc="The Cinnamon session handler"
|
||||
build_style=gnu-configure
|
||||
configure_args=" --disable-static --disable-schemas-compile
|
||||
--enable-systemd --disable-gconf"
|
||||
hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection
|
||||
gettext-devel intltool which"
|
||||
makedepends="gtk+3-devel dbus-devel upower-devel json-glib-devel libSM-devel
|
||||
systemd-devel pangox-compat-devel cinnamon-desktop-devel desktop-file-utils
|
||||
hicolor-icon-theme"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
license="GPL-3"
|
||||
homepage="http://cinnamon.linuxmint.com/"
|
||||
|
||||
do_fetch() {
|
||||
git clone -b ${version} git://github.com/linuxmint/${pkgname} ${pkgname}-${version}
|
||||
}
|
||||
|
||||
pre_configure() {
|
||||
./autogen.sh
|
||||
}
|
||||
|
||||
cinnamon-session_package() {
|
||||
depends="cinnamon-desktop desktop-file-utils hicolor-icon-theme"
|
||||
pkg_install() {
|
||||
vmove all
|
||||
}
|
||||
}
|
||||
1
srcpkgs/cinnamon-settings-daemon-devel
Symbolic link
1
srcpkgs/cinnamon-settings-daemon-devel
Symbolic link
|
|
@ -0,0 +1 @@
|
|||
cinnamon-settings-daemon
|
||||
447
srcpkgs/cinnamon-settings-daemon/patches/automount-plugin.patch
Normal file
447
srcpkgs/cinnamon-settings-daemon/patches/automount-plugin.patch
Normal file
|
|
@ -0,0 +1,447 @@
|
|||
diff -Naur cinnamon-settings-daemon-2.0.1.orig/data/org.cinnamon.settings-daemon.plugins.gschema.xml.in.in cinnamon-settings-daemon-2.0.1/data/org.cinnamon.settings-daemon.plugins.gschema.xml.in.in
|
||||
--- cinnamon-settings-daemon-2.0.6.orig/data/org.cinnamon.settings-daemon.plugins.gschema.xml.in.in 2013-11-03 10:50:04.000000000 -0500
|
||||
+++ cinnamon-settings-daemon-2.0.6/data/org.cinnamon.settings-daemon.plugins.gschema.xml.in.in 2013-11-05 15:33:21.112912392 -0500
|
||||
@@ -2,6 +2,7 @@
|
||||
<schema gettext-domain="@GETTEXT_PACKAGE@" id="org.cinnamon.settings-daemon.plugins" path="/org/cinnamon/settings-daemon/plugins/">
|
||||
<child name="a11y-keyboard" schema="org.cinnamon.settings-daemon.plugins.a11y-keyboard"/>
|
||||
<child name="a11y-settings" schema="org.cinnamon.settings-daemon.plugins.a11y-settings"/>
|
||||
+ <child name="automount" schema="org.cinnamon.settings-daemon.plugins.automount"/>
|
||||
<child name="clipboard" schema="org.cinnamon.settings-daemon.plugins.clipboard"/>
|
||||
<child name="color" schema="org.cinnamon.settings-daemon.plugins.color"/>
|
||||
<child name="cursor" schema="org.cinnamon.settings-daemon.plugins.cursor"/>
|
||||
@@ -42,6 +43,18 @@
|
||||
<_summary>Priority to use for this plugin</_summary>
|
||||
<_description>Priority to use for this plugin in cinnamon-settings-daemon startup queue</_description>
|
||||
</key>
|
||||
+ </schema>
|
||||
+ <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.cinnamon.settings-daemon.plugins.automount" path="/org/cinnamon/settings-daemon/plugins/automount/">
|
||||
+ <key name="active" type="b">
|
||||
+ <default>true</default>
|
||||
+ <_summary>Activation of this plugin</_summary>
|
||||
+ <_description>Whether this plugin would be activated by cinnamon-settings-daemon or not</_description>
|
||||
+ </key>
|
||||
+ <key name="priority" type="i">
|
||||
+ <default>97</default>
|
||||
+ <_summary>Priority to use for this plugin</_summary>
|
||||
+ <_description>Priority to use for this plugin in cinnamon-settings-daemon startup queue</_description>
|
||||
+ </key>
|
||||
</schema>
|
||||
<schema gettext-domain="@GETTEXT_PACKAGE@" id="org.cinnamon.settings-daemon.plugins.clipboard" path="/org/cinnamon/settings-daemon/plugins/clipboard/">
|
||||
<key name="active" type="b">
|
||||
diff -Naur cinnamon-settings-daemon-2.0.1.orig/plugins/automount/automount.cinnamon-settings-plugin.in cinnamon-settings-daemon-2.0.1/plugins/automount/automount.cinnamon-settings-plugin.in
|
||||
--- cinnamon-settings-daemon-2.0.1.orig/plugins/automount/automount.cinnamon-settings-plugin.in 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ cinnamon-settings-daemon-2.0.1/plugins/automount/automount.cinnamon-settings-plugin.in 2013-10-08 22:35:10.771472456 +0200
|
||||
@@ -0,0 +1,8 @@
|
||||
+[Cinnamon Settings Plugin]
|
||||
+Module=automount
|
||||
+IAge=0
|
||||
+_Name=Automount
|
||||
+_Description=Automounter plugin
|
||||
+Authors=Tomas Bzatek
|
||||
+Copyright=Copyright © 2010 Red Hat, Inc.
|
||||
+Website=
|
||||
diff -Naur cinnamon-settings-daemon-2.0.1.orig/plugins/automount/cinnamon-fallback-mount-helper.c cinnamon-settings-daemon-2.0.1/plugins/automount/cinnamon-fallback-mount-helper.c
|
||||
--- cinnamon-settings-daemon-2.0.1.orig/plugins/automount/cinnamon-fallback-mount-helper.c 2013-10-02 16:13:56.000000000 +0200
|
||||
+++ cinnamon-settings-daemon-2.0.1/plugins/automount/cinnamon-fallback-mount-helper.c 1970-01-01 01:00:00.000000000 +0100
|
||||
@@ -1,65 +0,0 @@
|
||||
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
|
||||
- *
|
||||
- * Copyright (C) 2010 Red Hat, Inc.
|
||||
- *
|
||||
- * This program is free software; you can redistribute it and/or modify
|
||||
- * it under the terms of the GNU General Public License as published by
|
||||
- * the Free Software Foundation; either version 2 of the License, or
|
||||
- * (at your option) any later version.
|
||||
- *
|
||||
- * This program is distributed in the hope that it will be useful,
|
||||
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
- * GNU General Public License for more details.
|
||||
- *
|
||||
- * You should have received a copy of the GNU General Public License
|
||||
- * along with this program; if not, write to the Free Software
|
||||
- * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
|
||||
- *
|
||||
- * Author: Tomas Bzatek <tbzatek@redhat.com>
|
||||
- */
|
||||
-
|
||||
-#include "config.h"
|
||||
-
|
||||
-#include <glib.h>
|
||||
-#include <glib/gi18n.h>
|
||||
-#include <unistd.h>
|
||||
-#include <gtk/gtk.h>
|
||||
-
|
||||
-#include "csd-automount-manager.h"
|
||||
-
|
||||
-int
|
||||
-main (int argc,
|
||||
- char **argv)
|
||||
-{
|
||||
- GMainLoop *loop;
|
||||
- CsdAutomountManager *manager;
|
||||
- GError *error = NULL;
|
||||
-
|
||||
- g_type_init ();
|
||||
- gtk_init (&argc, &argv);
|
||||
-
|
||||
- bindtextdomain (GETTEXT_PACKAGE, CINNAMON_SETTINGS_LOCALEDIR);
|
||||
- bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
|
||||
- textdomain (GETTEXT_PACKAGE);
|
||||
-
|
||||
- loop = g_main_loop_new (NULL, FALSE);
|
||||
- manager = csd_automount_manager_new ();
|
||||
-
|
||||
- csd_automount_manager_start (manager, &error);
|
||||
-
|
||||
- if (error != NULL) {
|
||||
- g_printerr ("Unable to start the mount manager: %s",
|
||||
- error->message);
|
||||
-
|
||||
- g_error_free (error);
|
||||
- _exit (1);
|
||||
- }
|
||||
-
|
||||
- g_main_loop_run (loop);
|
||||
-
|
||||
- csd_automount_manager_stop (manager);
|
||||
- g_main_loop_unref (loop);
|
||||
-
|
||||
- return 0;
|
||||
-}
|
||||
diff -Naur cinnamon-settings-daemon-2.0.1.orig/plugins/automount/cinnamon-fallback-mount-helper.desktop.in.in cinnamon-settings-daemon-2.0.1/plugins/automount/cinnamon-fallback-mount-helper.desktop.in.in
|
||||
--- cinnamon-settings-daemon-2.0.1.orig/plugins/automount/cinnamon-fallback-mount-helper.desktop.in.in 2013-10-02 16:13:56.000000000 +0200
|
||||
+++ cinnamon-settings-daemon-2.0.1/plugins/automount/cinnamon-fallback-mount-helper.desktop.in.in 1970-01-01 01:00:00.000000000 +0100
|
||||
@@ -1,12 +0,0 @@
|
||||
-[Desktop Entry]
|
||||
-_Name=Mount Helper
|
||||
-_Comment=Automount and autorun plugged devices
|
||||
-Exec=@LIBEXECDIR@/cinnamon-fallback-mount-helper
|
||||
-Icon=drive-optical
|
||||
-Terminal=false
|
||||
-Type=Application
|
||||
-Categories=
|
||||
-NoDisplay=true
|
||||
-OnlyShowIn=GNOME;
|
||||
-X-GNOME-Autostart-Notify=true
|
||||
-
|
||||
diff -Naur cinnamon-settings-daemon-2.0.1.orig/plugins/automount/csd-automount-plugin.c cinnamon-settings-daemon-2.0.1/plugins/automount/csd-automount-plugin.c
|
||||
--- cinnamon-settings-daemon-2.0.1.orig/plugins/automount/csd-automount-plugin.c 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ cinnamon-settings-daemon-2.0.1/plugins/automount/csd-automount-plugin.c 2013-10-08 22:35:10.771472456 +0200
|
||||
@@ -0,0 +1,106 @@
|
||||
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
|
||||
+ *
|
||||
+ * Copyright (C) 2010 Red Hat, Inc.
|
||||
+ *
|
||||
+ * This program is free software; you can redistribute it and/or modify
|
||||
+ * it under the terms of the GNU General Public License as published by
|
||||
+ * the Free Software Foundation; either version 2 of the License, or
|
||||
+ * (at your option) any later version.
|
||||
+ *
|
||||
+ * This program is distributed in the hope that it will be useful,
|
||||
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
+ * GNU General Public License for more details.
|
||||
+ *
|
||||
+ * You should have received a copy of the GNU General Public License
|
||||
+ * along with this program; if not, write to the Free Software
|
||||
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
+ *
|
||||
+ * Author: Tomas Bzatek <tbzatek@redhat.com>
|
||||
+ */
|
||||
+
|
||||
+#include "config.h"
|
||||
+
|
||||
+#include <glib/gi18n-lib.h>
|
||||
+#include <gmodule.h>
|
||||
+
|
||||
+#include "cinnamon-settings-plugin.h"
|
||||
+#include "csd-automount-plugin.h"
|
||||
+#include "csd-automount-manager.h"
|
||||
+
|
||||
+struct CsdAutomountPluginPrivate {
|
||||
+ CsdAutomountManager *manager;
|
||||
+};
|
||||
+
|
||||
+#define CSD_AUTOMOUNT_PLUGIN_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), CSD_TYPE_AUTOMOUNT_PLUGIN, CsdAutomountPluginPrivate))
|
||||
+
|
||||
+CINNAMON_SETTINGS_PLUGIN_REGISTER (CsdAutomountPlugin, csd_automount_plugin)
|
||||
+
|
||||
+static void
|
||||
+csd_automount_plugin_init (CsdAutomountPlugin *plugin)
|
||||
+{
|
||||
+ plugin->priv = CSD_AUTOMOUNT_PLUGIN_GET_PRIVATE (plugin);
|
||||
+
|
||||
+ g_debug ("Automount plugin initializing");
|
||||
+
|
||||
+ plugin->priv->manager = csd_automount_manager_new ();
|
||||
+}
|
||||
+
|
||||
+static void
|
||||
+csd_automount_plugin_finalize (GObject *object)
|
||||
+{
|
||||
+ CsdAutomountPlugin *plugin;
|
||||
+
|
||||
+ g_return_if_fail (object != NULL);
|
||||
+ g_return_if_fail (CSD_IS_AUTOMOUNT_PLUGIN (object));
|
||||
+
|
||||
+ g_debug ("Automount plugin finalizing");
|
||||
+
|
||||
+ plugin = CSD_AUTOMOUNT_PLUGIN (object);
|
||||
+
|
||||
+ g_return_if_fail (plugin->priv != NULL);
|
||||
+
|
||||
+ if (plugin->priv->manager != NULL) {
|
||||
+ g_object_unref (plugin->priv->manager);
|
||||
+ }
|
||||
+
|
||||
+ G_OBJECT_CLASS (csd_automount_plugin_parent_class)->finalize (object);
|
||||
+}
|
||||
+
|
||||
+static void
|
||||
+impl_activate (CinnamonSettingsPlugin *plugin)
|
||||
+{
|
||||
+ gboolean res;
|
||||
+ GError *error;
|
||||
+
|
||||
+ g_debug ("Activating automount plugin");
|
||||
+
|
||||
+ error = NULL;
|
||||
+ res = csd_automount_manager_start (CSD_AUTOMOUNT_PLUGIN (plugin)->priv->manager, &error);
|
||||
+ if (! res) {
|
||||
+ g_warning ("Unable to start automount manager: %s", error->message);
|
||||
+ g_error_free (error);
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+static void
|
||||
+impl_deactivate (CinnamonSettingsPlugin *plugin)
|
||||
+{
|
||||
+ g_debug ("Deactivating automount plugin");
|
||||
+ csd_automount_manager_stop (CSD_AUTOMOUNT_PLUGIN (plugin)->priv->manager);
|
||||
+}
|
||||
+
|
||||
+static void
|
||||
+csd_automount_plugin_class_init (CsdAutomountPluginClass *klass)
|
||||
+{
|
||||
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
|
||||
+ CinnamonSettingsPluginClass *plugin_class = CINNAMON_SETTINGS_PLUGIN_CLASS (klass);
|
||||
+
|
||||
+ object_class->finalize = csd_automount_plugin_finalize;
|
||||
+
|
||||
+ plugin_class->activate = impl_activate;
|
||||
+ plugin_class->deactivate = impl_deactivate;
|
||||
+
|
||||
+ g_type_class_add_private (klass, sizeof (CsdAutomountPluginPrivate));
|
||||
+}
|
||||
+
|
||||
diff -Naur cinnamon-settings-daemon-2.0.1.orig/plugins/automount/csd-automount-plugin.h cinnamon-settings-daemon-2.0.1/plugins/automount/csd-automount-plugin.h
|
||||
--- cinnamon-settings-daemon-2.0.1.orig/plugins/automount/csd-automount-plugin.h 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ cinnamon-settings-daemon-2.0.1/plugins/automount/csd-automount-plugin.h 2013-10-08 22:35:10.771472456 +0200
|
||||
@@ -0,0 +1,60 @@
|
||||
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
|
||||
+ *
|
||||
+ * Copyright (C) 2010 Red Hat, Inc.
|
||||
+ *
|
||||
+ * This program is free software; you can redistribute it and/or modify
|
||||
+ * it under the terms of the GNU General Public License as published by
|
||||
+ * the Free Software Foundation; either version 2 of the License, or
|
||||
+ * (at your option) any later version.
|
||||
+ *
|
||||
+ * This program is distributed in the hope that it will be useful,
|
||||
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
+ * GNU General Public License for more details.
|
||||
+ *
|
||||
+ * You should have received a copy of the GNU General Public License
|
||||
+ * along with this program; if not, write to the Free Software
|
||||
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
+ *
|
||||
+ * Author: Tomas Bzatek <tbzatek@redhat.com>
|
||||
+ */
|
||||
+
|
||||
+#ifndef __CSD_AUTOMOUNT_PLUGIN_H__
|
||||
+#define __CSD_AUTOMOUNT_PLUGIN_H__
|
||||
+
|
||||
+#include <glib.h>
|
||||
+#include <glib-object.h>
|
||||
+#include <gmodule.h>
|
||||
+
|
||||
+#include "cinnamon-settings-plugin.h"
|
||||
+
|
||||
+G_BEGIN_DECLS
|
||||
+
|
||||
+#define CSD_TYPE_AUTOMOUNT_PLUGIN (csd_automount_plugin_get_type ())
|
||||
+#define CSD_AUTOMOUNT_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CSD_TYPE_AUTOMOUNT_PLUGIN, CsdAutomountPlugin))
|
||||
+#define CSD_AUTOMOUNT_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), CSD_TYPE_AUTOMOUNT_PLUGIN, CsdAutomountPluginClass))
|
||||
+#define CSD_IS_AUTOMOUNT_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), CSD_TYPE_AUTOMOUNT_PLUGIN))
|
||||
+#define CSD_IS_AUTOMOUNT_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), CSD_TYPE_AUTOMOUNT_PLUGIN))
|
||||
+#define CSD_AUTOMOUNT_PLUGIN_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), CSD_TYPE_AUTOMOUNT_PLUGIN, CsdAutomountPluginClass))
|
||||
+
|
||||
+typedef struct CsdAutomountPluginPrivate CsdAutomountPluginPrivate;
|
||||
+
|
||||
+typedef struct
|
||||
+{
|
||||
+ CinnamonSettingsPlugin parent;
|
||||
+ CsdAutomountPluginPrivate *priv;
|
||||
+} CsdAutomountPlugin;
|
||||
+
|
||||
+typedef struct
|
||||
+{
|
||||
+ CinnamonSettingsPluginClass parent_class;
|
||||
+} CsdAutomountPluginClass;
|
||||
+
|
||||
+GType csd_automount_plugin_get_type (void) G_GNUC_CONST;
|
||||
+
|
||||
+/* All the plugins must implement this function */
|
||||
+G_MODULE_EXPORT GType register_cinnamon_settings_plugin (GTypeModule *module);
|
||||
+
|
||||
+G_END_DECLS
|
||||
+
|
||||
+#endif /* __CSD_AUTOMOUNT_PLUGIN_H__ */
|
||||
diff -Naur cinnamon-settings-daemon-2.0.1.orig/plugins/automount/Makefile.am cinnamon-settings-daemon-2.0.1/plugins/automount/Makefile.am
|
||||
--- cinnamon-settings-daemon-2.0.1.orig/plugins/automount/Makefile.am 2013-10-02 16:13:56.000000000 +0200
|
||||
+++ cinnamon-settings-daemon-2.0.1/plugins/automount/Makefile.am 2013-10-08 22:48:19.240865461 +0200
|
||||
@@ -1,38 +1,87 @@
|
||||
-libexec_PROGRAMS = cinnamon-fallback-mount-helper
|
||||
+NULL =
|
||||
|
||||
-cinnamon_fallback_mount_helper_SOURCES = \
|
||||
- cinnamon-fallback-mount-helper.c \
|
||||
- csd-automount-manager.c \
|
||||
- csd-automount-manager.h \
|
||||
- csd-autorun.c \
|
||||
- csd-autorun.h
|
||||
+plugin_name = automount
|
||||
|
||||
-cinnamon_fallback_mount_helper_CPPFLAGS = \
|
||||
+libexec_PROGRAMS = csd-test-automount
|
||||
+
|
||||
+csd_test_automount_SOURCES = \
|
||||
+ test-automount.c \
|
||||
+ csd-automount-manager.h \
|
||||
+ csd-automount-manager.c \
|
||||
+ csd-autorun.c \
|
||||
+ csd-autorun.h \
|
||||
+ $(NULL)
|
||||
+
|
||||
+csd_test_automount_CPPFLAGS = \
|
||||
-I$(top_srcdir)/cinnamon-settings-daemon \
|
||||
+ -I$(top_srcdir)/plugins/common \
|
||||
-DCINNAMON_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
|
||||
$(AM_CPPFLAGS)
|
||||
|
||||
-cinnamon_fallback_mount_helper_CFLAGS = \
|
||||
+csd_test_automount_CFLAGS = \
|
||||
+ $(PLUGIN_CFLAGS) \
|
||||
$(SETTINGS_PLUGIN_CFLAGS) \
|
||||
$(SYSTEMD_CFLAGS) \
|
||||
$(AUTOMOUNT_CFLAGS)
|
||||
+ $(AM_CFLAGS)
|
||||
+
|
||||
+csd_test_automount_LDADD = \
|
||||
+ $(top_builddir)/cinnamon-settings-daemon/libcsd.la \
|
||||
+ $(SETTINGS_PLUGIN_LIBS) \
|
||||
+ $(SYSTEMD_LIBS) \
|
||||
+ $(AUTOMOUNT_LIBS) \
|
||||
+ $(NULL)
|
||||
+
|
||||
+plugin_LTLIBRARIES = \
|
||||
+ libautomount.la \
|
||||
+ $(NULL)
|
||||
+
|
||||
+libautomount_la_SOURCES = \
|
||||
+ csd-automount-plugin.h \
|
||||
+ csd-automount-plugin.c \
|
||||
+ csd-automount-manager.h \
|
||||
+ csd-automount-manager.c \
|
||||
+ csd-autorun.c \
|
||||
+ csd-autorun.h \
|
||||
+ $(NULL)
|
||||
+
|
||||
+libautomount_la_CPPFLAGS = \
|
||||
+ -I$(top_srcdir)/cinnamon-settings-daemon \
|
||||
+ -DCINNAMON_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
|
||||
+ $(AM_CPPFLAGS)
|
||||
+
|
||||
+libautomount_la_CFLAGS = \
|
||||
+ $(SETTINGS_PLUGIN_CFLAGS) \
|
||||
+ $(SYSTEMD_CFLAGS) \
|
||||
+ $(AUTOMOUNT_CFLAGS) \
|
||||
+ $(AM_CFLAGS)
|
||||
+
|
||||
+libautomount_la_LDFLAGS = \
|
||||
+ $(CSD_PLUGIN_LDFLAGS) \
|
||||
+ $(NULL)
|
||||
|
||||
-cinnamon_fallback_mount_helper_LDADD = \
|
||||
+libautomount_la_LIBADD = \
|
||||
$(SETTINGS_PLUGIN_LIBS) \
|
||||
$(SYSTEMD_LIBS) \
|
||||
$(AUTOMOUNT_LIBS) \
|
||||
- $(top_builddir)/cinnamon-settings-daemon/libcsd.la
|
||||
+ $(NULL)
|
||||
|
||||
-autostartdir = $(datadir)/applications
|
||||
-autostart_in_files = cinnamon-fallback-mount-helper.desktop.in
|
||||
-autostart_in_in_files = cinnamon-fallback-mount-helper.desktop.in.in
|
||||
-autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
|
||||
+plugin_in_files = \
|
||||
+ automount.cinnamon-settings-plugin.in \
|
||||
+ $(NULL)
|
||||
|
||||
-$(autostart_in_files): $(autostart_in_in_files)
|
||||
- @sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
|
||||
+plugin_DATA = $(plugin_in_files:.cinnamon-settings-plugin.in=.cinnamon-settings-plugin)
|
||||
|
||||
-@INTLTOOL_DESKTOP_RULE@
|
||||
+EXTRA_DIST = \
|
||||
+ $(plugin_in_files) \
|
||||
+ $(NULL)
|
||||
|
||||
-EXTRA_DIST = $(autostart_in_in_files)
|
||||
+CLEANFILES = \
|
||||
+ $(plugin_DATA) \
|
||||
+ $(NULL)
|
||||
|
||||
-CLEANFILES = $(autostart_DATA) $(autostart_in_files)
|
||||
+DISTCLEANFILES = \
|
||||
+ $(plugin_DATA) \
|
||||
+ $(NULL)
|
||||
+
|
||||
+@CSD_INTLTOOL_PLUGIN_RULE@
|
||||
diff -Naur cinnamon-settings-daemon-2.0.1.orig/plugins/automount/test-automount.c cinnamon-settings-daemon-2.0.1/plugins/automount/test-automount.c
|
||||
--- cinnamon-settings-daemon-2.0.1.orig/plugins/automount/test-automount.c 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ cinnamon-settings-daemon-2.0.1/plugins/automount/test-automount.c 2013-10-08 22:42:53.759486525 +0200
|
||||
@@ -0,0 +1,7 @@
|
||||
+#define NEW csd_automount_manager_new
|
||||
+#define START csd_automount_manager_start
|
||||
+#define STOP csd_automount_manager_stop
|
||||
+#define MANAGER CsdAutomountManager
|
||||
+#include "csd-automount-manager.h"
|
||||
+
|
||||
+#include "test-plugin.h"
|
||||
diff -Naur cinnamon-settings-daemon-2.0.1.orig/po/POTFILES.in cinnamon-settings-daemon-2.0.1/po/POTFILES.in
|
||||
--- cinnamon-settings-daemon-2.0.1.orig/po/POTFILES.in 2013-10-02 16:13:56.000000000 +0200
|
||||
+++ cinnamon-settings-daemon-2.0.1/po/POTFILES.in 2013-10-08 22:35:10.771472456 +0200
|
||||
@@ -18,8 +18,9 @@
|
||||
plugins/a11y-keyboard/csd-a11y-preferences-dialog.c
|
||||
[type: gettext/glade]plugins/a11y-keyboard/csd-a11y-preferences-dialog.ui
|
||||
[type: gettext/ini]plugins/a11y-settings/a11y-settings.cinnamon-settings-plugin.in
|
||||
-plugins/automount/cinnamon-fallback-mount-helper.desktop.in.in
|
||||
+[type: gettext/ini]plugins/automount/automount.cinnamon-settings-plugin.in
|
||||
plugins/automount/csd-automount-manager.c
|
||||
+plugins/automount/csd-automount-plugin.c
|
||||
plugins/automount/csd-autorun.c
|
||||
[type: gettext/ini]plugins/background/background.cinnamon-settings-plugin.in
|
||||
[type: gettext/ini]plugins/clipboard/clipboard.cinnamon-settings-plugin.in
|
||||
diff -Naur cinnamon-settings-daemon-2.0.1.orig/po/POTFILES.skip cinnamon-settings-daemon-2.0.1/po/POTFILES.skip
|
||||
--- cinnamon-settings-daemon-2.0.1.orig/po/POTFILES.skip 2013-10-02 16:13:56.000000000 +0200
|
||||
+++ cinnamon-settings-daemon-2.0.1/po/POTFILES.skip 2013-10-08 22:37:20.224645009 +0200
|
||||
@@ -20,6 +20,5 @@
|
||||
data/org.cinnamon.settings-daemon.plugins.updates.gschema.xml.in
|
||||
data/org.cinnamon.settings-daemon.plugins.xrandr.gschema.xml.in
|
||||
data/org.cinnamon.settings-daemon.plugins.xsettings.gschema.xml.in
|
||||
-plugins/automount/gnome-fallback-mount-helper.desktop.in
|
||||
plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in
|
||||
plugins/wacom/org.cinnamon.settings-daemon.plugins.wacom.policy.in
|
||||
4728
srcpkgs/cinnamon-settings-daemon/patches/keyboard.patch
Normal file
4728
srcpkgs/cinnamon-settings-daemon/patches/keyboard.patch
Normal file
File diff suppressed because it is too large
Load diff
42
srcpkgs/cinnamon-settings-daemon/template
Normal file
42
srcpkgs/cinnamon-settings-daemon/template
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
# Template file for 'cinnamon-settings-daemon'
|
||||
pkgname=cinnamon-settings-daemon
|
||||
version=2.0.8
|
||||
revision=1
|
||||
patch_args="-Np1"
|
||||
short_desc="The Cinnamon Settings Daemon"
|
||||
build_style=gnu-configure
|
||||
configure_args=" --disable-static --disable-schemas-compile
|
||||
--enable-systemd --disable-gconf"
|
||||
hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection
|
||||
gettext-devel intltool which xmlto docbook-xml"
|
||||
makedepends="gtk+3-devel dbus-devel upower-devel json-glib-devel libSM-devel
|
||||
systemd-devel libnotify-devel cinnamon-desktop-devel lcms2-devel ibus-devel
|
||||
pulseaudio-devel libcanberra-devel colord-devel cups-devel nss-devel polkit-devel
|
||||
desktop-file-utils hicolor-icon-theme"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
license="GPL-3"
|
||||
homepage="http://cinnamon.linuxmint.com/"
|
||||
|
||||
do_fetch() {
|
||||
git clone -b ${version} git://github.com/linuxmint/${pkgname} ${pkgname}-${version}
|
||||
}
|
||||
|
||||
pre_configure() {
|
||||
NOCONFIGURE=1 ./autogen.sh
|
||||
}
|
||||
|
||||
cinnamon-settings-daemon-devel_package() {
|
||||
short_desc+=" - development files"
|
||||
depends="libglib-devel"
|
||||
pkg_install() {
|
||||
vmove usr/include
|
||||
vmove usr/lib/pkgconfig
|
||||
}
|
||||
}
|
||||
|
||||
cinnamon-settings-daemon_package() {
|
||||
depends="desktop-file-utils hicolor-icon-theme"
|
||||
pkg_install() {
|
||||
vmove all
|
||||
}
|
||||
}
|
||||
25
srcpkgs/cinnamon-translations/template
Normal file
25
srcpkgs/cinnamon-translations/template
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
# Template file for 'cinnamon-translations'
|
||||
pkgname=cinnamon-translations
|
||||
version=2.0.3
|
||||
revision=1
|
||||
short_desc="Translations for Cinnamon and Nemo"
|
||||
maintainer="Roelof Wobben <rwobben@hotmail.com>"
|
||||
license="GPL-3"
|
||||
homepage="http://cinnamon.linuxmint.com/"
|
||||
|
||||
do_fetch() {
|
||||
git clone -b ${version} git://github.com/linuxmint/${pkgname} ${pkgname}-${version}
|
||||
}
|
||||
|
||||
do_install () {
|
||||
vmkdir /usr/share/cinnamon/locale
|
||||
cp -a mo-export/* ${DESTDIR}/usr/share/cinnamon/locale
|
||||
}
|
||||
|
||||
cinnamon-translations_package() {
|
||||
noarch=yes
|
||||
pkg_install () {
|
||||
vmove all
|
||||
}
|
||||
|
||||
}
|
||||
20
srcpkgs/cinnamon/files/org.cinnamon.settings-users.policy
Normal file
20
srcpkgs/cinnamon/files/org.cinnamon.settings-users.policy
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE policyconfig PUBLIC
|
||||
"-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
|
||||
"http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
|
||||
<policyconfig>
|
||||
|
||||
<action id="org.cinnamon.settings-users">
|
||||
<message>Authentication is required to run the Cinnamon Users and Groups</message>
|
||||
<icon_name>system-users</icon_name>
|
||||
<defaults>
|
||||
<allow_any>auth_admin</allow_any>
|
||||
<allow_inactive>auth_admin</allow_inactive>
|
||||
<allow_active>auth_admin</allow_active>
|
||||
</defaults>
|
||||
<annotate key="org.freedesktop.policykit.exec.path">/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py</annotate>
|
||||
<annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
|
||||
</action>
|
||||
|
||||
</policyconfig>
|
||||
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
[Desktop Entry]
|
||||
Name=PolicyKit Authentication Agent
|
||||
Comment=PolicyKit Authentication Agent
|
||||
Exec=/usr/libexec/polkit-gnome-authentication-agent-1
|
||||
Terminal=false
|
||||
Type=Application
|
||||
Categories=
|
||||
NoDisplay=true
|
||||
OnlyShowIn=GNOME;XFCE;Unity;
|
||||
X-GNOME-AutoRestart=true
|
||||
282
srcpkgs/cinnamon/patches/cinnamon-gstreamer1.patch
Normal file
282
srcpkgs/cinnamon/patches/cinnamon-gstreamer1.patch
Normal file
|
|
@ -0,0 +1,282 @@
|
|||
diff -ruN a/configure.ac b/configure.ac
|
||||
--- a/configure.ac 2013-10-16 15:10:22.237511846 +0000
|
||||
+++ b/configure.ac 2013-10-16 15:00:45.501321091 +0000
|
||||
@@ -44,15 +44,15 @@
|
||||
|
||||
# We need at least this, since gst_plugin_register_static() was added
|
||||
# in 0.10.16, but nothing older than 0.10.21 has been tested.
|
||||
-GSTREAMER_MIN_VERSION=0.10.16
|
||||
+GSTREAMER_MIN_VERSION=0.11.92
|
||||
|
||||
recorder_modules=
|
||||
build_recorder=false
|
||||
AC_MSG_CHECKING([for GStreamer (needed for recording functionality)])
|
||||
-if $PKG_CONFIG --exists gstreamer-0.10 '>=' $GSTREAMER_MIN_VERSION ; then
|
||||
+if $PKG_CONFIG --exists gstreamer-1.0 '>=' $GSTREAMER_MIN_VERSION ; then
|
||||
AC_MSG_RESULT(yes)
|
||||
build_recorder=true
|
||||
- recorder_modules="gstreamer-0.10 gstreamer-base-0.10 x11"
|
||||
+ recorder_modules="gstreamer-1.0 gstreamer-base-1.0 x11"
|
||||
PKG_CHECK_MODULES(TEST_CINNAMON_RECORDER, $recorder_modules clutter-1.0 xfixes)
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
diff -ruN a/src/cinnamon-recorder.c b/src/cinnamon-recorder.c
|
||||
--- a/src/cinnamon-recorder.c 2013-10-16 15:10:22.344177808 +0000
|
||||
+++ b/src/cinnamon-recorder.c 2013-10-16 15:26:42.801040167 +0000
|
||||
@@ -8,6 +8,7 @@
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
|
||||
+#define GST_USE_UNSTABLE_API
|
||||
#include <gst/gst.h>
|
||||
|
||||
#include "cinnamon-recorder-src.h"
|
||||
@@ -147,7 +148,7 @@
|
||||
* (Theora does have some support for frames at non-uniform times, but
|
||||
* things seem to break down if there are large gaps.)
|
||||
*/
|
||||
-#define DEFAULT_PIPELINE "videorate ! vp8enc quality=10 speed=2 threads=%T ! queue ! webmmux"
|
||||
+#define DEFAULT_PIPELINE "vp8enc min_quantizer=13 max_quantizer=13 cpu-used=5 deadline=1000000 threads=%T ! queue ! webmmux"
|
||||
|
||||
/* The default filename pattern. Example cinnamon-20090311b-2.webm
|
||||
*/
|
||||
@@ -446,6 +447,7 @@
|
||||
recorder_draw_cursor (CinnamonRecorder *recorder,
|
||||
GstBuffer *buffer)
|
||||
{
|
||||
+ GstMapInfo info;
|
||||
cairo_surface_t *surface;
|
||||
cairo_t *cr;
|
||||
|
||||
@@ -464,7 +466,8 @@
|
||||
if (!recorder->cursor_image)
|
||||
return;
|
||||
|
||||
- surface = cairo_image_surface_create_for_data (GST_BUFFER_DATA(buffer),
|
||||
+ gst_buffer_map (buffer, &info, GST_MAP_WRITE);
|
||||
+ surface = cairo_image_surface_create_for_data (info.data,
|
||||
CAIRO_FORMAT_ARGB32,
|
||||
recorder->stage_width,
|
||||
recorder->stage_height,
|
||||
@@ -479,6 +482,7 @@
|
||||
|
||||
cairo_destroy (cr);
|
||||
cairo_surface_destroy (surface);
|
||||
+ gst_buffer_unmap (buffer, &info);
|
||||
}
|
||||
|
||||
/* Draw an overlay indicating how much of the target memory is used
|
||||
@@ -541,10 +545,11 @@
|
||||
data = g_malloc (size);
|
||||
|
||||
buffer = gst_buffer_new();
|
||||
- GST_BUFFER_SIZE(buffer) = size;
|
||||
- GST_BUFFER_MALLOCDATA(buffer) = GST_BUFFER_DATA(buffer) = data;
|
||||
+ gst_buffer_insert_memory (buffer, -1,
|
||||
+ gst_memory_new_wrapped (0, data, size, 0,
|
||||
+ size, data, g_free));
|
||||
|
||||
- GST_BUFFER_TIMESTAMP(buffer) = get_wall_time() - recorder->start_time;
|
||||
+ GST_BUFFER_PTS(buffer) = get_wall_time() - recorder->start_time;
|
||||
|
||||
cogl_read_pixels (0, 0,
|
||||
recorder->stage_width, recorder->stage_height,
|
||||
@@ -1042,23 +1047,18 @@
|
||||
{
|
||||
GstCaps *caps;
|
||||
|
||||
- /* The data is always native-endian xRGB; ffmpegcolorspace
|
||||
+ /* The data is always native-endian xRGB; videoconvert
|
||||
* doesn't support little-endian xRGB, but does support
|
||||
* big-endian BGRx.
|
||||
*/
|
||||
- caps = gst_caps_new_simple ("video/x-raw-rgb",
|
||||
- "bpp", G_TYPE_INT, 32,
|
||||
- "depth", G_TYPE_INT, 24,
|
||||
+ caps = gst_caps_new_simple ("video/x-raw",
|
||||
#if G_BYTE_ORDER == G_LITTLE_ENDIAN
|
||||
- "red_mask", G_TYPE_INT, 0x0000ff00,
|
||||
- "green_mask", G_TYPE_INT, 0x00ff0000,
|
||||
- "blue_mask", G_TYPE_INT, 0xff000000,
|
||||
+ "format", G_TYPE_STRING, "BGRx",
|
||||
#else
|
||||
- "red_mask", G_TYPE_INT, 0xff0000,
|
||||
- "green_mask", G_TYPE_INT, 0x00ff00,
|
||||
- "blue_mask", G_TYPE_INT, 0x0000ff,
|
||||
+ "format", G_TYPE_STRING, "xRGB",
|
||||
#endif
|
||||
- "endianness", G_TYPE_INT, G_BIG_ENDIAN,
|
||||
+ "bpp", G_TYPE_INT, 32,
|
||||
+ "depth", G_TYPE_INT, 24,
|
||||
"framerate", GST_TYPE_FRACTION, pipeline->recorder->framerate, 1,
|
||||
"width", G_TYPE_INT, pipeline->recorder->stage_width,
|
||||
"height", G_TYPE_INT, pipeline->recorder->stage_height,
|
||||
@@ -1076,7 +1076,7 @@
|
||||
{
|
||||
GstPad *sink_pad = NULL, *src_pad = NULL;
|
||||
gboolean result = FALSE;
|
||||
- GstElement *ffmpegcolorspace;
|
||||
+ GstElement *videoconvert;
|
||||
|
||||
sink_pad = gst_bin_find_unlinked_pad (GST_BIN (pipeline->pipeline), GST_PAD_SINK);
|
||||
if (sink_pad == NULL)
|
||||
@@ -1095,19 +1095,19 @@
|
||||
|
||||
recorder_pipeline_set_caps (pipeline);
|
||||
|
||||
- /* The ffmpegcolorspace element is a generic converter; it will convert
|
||||
+ /* The videoconvert element is a generic converter; it will convert
|
||||
* our supplied fixed format data into whatever the encoder wants
|
||||
*/
|
||||
- ffmpegcolorspace = gst_element_factory_make ("ffmpegcolorspace", NULL);
|
||||
- if (!ffmpegcolorspace)
|
||||
+ videoconvert = gst_element_factory_make ("videoconvert", NULL);
|
||||
+ if (!videoconvert)
|
||||
{
|
||||
- g_warning("Can't create ffmpegcolorspace element");
|
||||
+ g_warning("Can't create videoconvert element");
|
||||
goto out;
|
||||
}
|
||||
- gst_bin_add (GST_BIN (pipeline->pipeline), ffmpegcolorspace);
|
||||
+ gst_bin_add (GST_BIN (pipeline->pipeline), videoconvert);
|
||||
|
||||
- gst_element_link_many (pipeline->src, ffmpegcolorspace, NULL);
|
||||
- src_pad = gst_element_get_static_pad (ffmpegcolorspace, "src");
|
||||
+ gst_element_link_many (pipeline->src, videoconvert, NULL);
|
||||
+ src_pad = gst_element_get_static_pad (videoconvert, "src");
|
||||
|
||||
if (!src_pad)
|
||||
{
|
||||
@@ -1637,7 +1637,7 @@
|
||||
* might be used to send the output to an icecast server
|
||||
* via shout2send or similar.
|
||||
*
|
||||
- * The default value is 'videorate ! theoraenc ! oggmux'
|
||||
+ * The default value is 'vp8enc min_quantizer=13 max_quantizer=13 cpu-used=5 deadline=1000000 threads=%T ! queue ! webmmux'
|
||||
*/
|
||||
void
|
||||
cinnamon_recorder_set_pipeline (CinnamonRecorder *recorder,
|
||||
diff -ruN a/src/cinnamon-recorder-src.c b/src/cinnamon-recorder-src.c
|
||||
--- a/src/cinnamon-recorder-src.c 2013-10-16 15:10:22.347511119 +0000
|
||||
+++ b/src/cinnamon-recorder-src.c 2013-10-16 15:33:41.581609206 +0000
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
#include "config.h"
|
||||
|
||||
+#define GST_USE_UNSTABLE_API
|
||||
#include <gst/base/gstpushsrc.h>
|
||||
|
||||
#include "cinnamon-recorder-src.h"
|
||||
@@ -12,6 +13,9 @@
|
||||
|
||||
GMutex *mutex;
|
||||
|
||||
+ GstClock *clock;
|
||||
+ GstClockTime last_frame_time;
|
||||
+
|
||||
GstCaps *caps;
|
||||
GAsyncQueue *queue;
|
||||
gboolean closed;
|
||||
@@ -33,21 +37,21 @@
|
||||
/* Special marker value once the source is closed */
|
||||
#define RECORDER_QUEUE_END ((GstBuffer *)1)
|
||||
|
||||
-GST_BOILERPLATE(CinnamonRecorderSrc, cinnamon_recorder_src, GstPushSrc, GST_TYPE_PUSH_SRC);
|
||||
+G_DEFINE_TYPE(CinnamonRecorderSrc, cinnamon_recorder_src, GST_TYPE_PUSH_SRC);
|
||||
|
||||
static void
|
||||
-cinnamon_recorder_src_init (CinnamonRecorderSrc *src,
|
||||
- CinnamonRecorderSrcClass *klass)
|
||||
+cinnamon_recorder_src_init (CinnamonRecorderSrc *src)
|
||||
{
|
||||
+ gst_base_src_set_format (GST_BASE_SRC (src), GST_FORMAT_TIME);
|
||||
+ gst_base_src_set_live (GST_BASE_SRC (src), TRUE);
|
||||
+
|
||||
+ src->clock = gst_system_clock_obtain ();
|
||||
+ src->last_frame_time = 0;
|
||||
+
|
||||
src->queue = g_async_queue_new ();
|
||||
src->mutex = g_mutex_new ();
|
||||
}
|
||||
|
||||
-static void
|
||||
-cinnamon_recorder_src_base_init (gpointer klass)
|
||||
-{
|
||||
-}
|
||||
-
|
||||
static gboolean
|
||||
cinnamon_recorder_src_memory_used_update_idle (gpointer data)
|
||||
{
|
||||
@@ -87,21 +91,28 @@
|
||||
GstBuffer *buffer;
|
||||
|
||||
if (src->closed)
|
||||
- return GST_FLOW_UNEXPECTED;
|
||||
+ return GST_FLOW_EOS;
|
||||
|
||||
buffer = g_async_queue_pop (src->queue);
|
||||
+ if (src->last_frame_time == 0)
|
||||
+ src->last_frame_time = gst_clock_get_time (GST_CLOCK (src->clock));
|
||||
+
|
||||
if (buffer == RECORDER_QUEUE_END)
|
||||
{
|
||||
/* Returning UNEXPECTED here will cause a EOS message to be sent */
|
||||
src->closed = TRUE;
|
||||
- return GST_FLOW_UNEXPECTED;
|
||||
+ return GST_FLOW_EOS;
|
||||
}
|
||||
|
||||
cinnamon_recorder_src_update_memory_used (src,
|
||||
- - (int)(GST_BUFFER_SIZE(buffer) / 1024));
|
||||
+ - (int)(gst_buffer_get_size(buffer) / 1024));
|
||||
|
||||
*buffer_out = buffer;
|
||||
|
||||
+ GST_BUFFER_DURATION(*buffer_out) = GST_CLOCK_DIFF (src->last_frame_time, gst_clock_get_time (GST_CLOCK (src->clock)));
|
||||
+
|
||||
+ src->last_frame_time = gst_clock_get_time (GST_CLOCK (src->clock));
|
||||
+
|
||||
return GST_FLOW_OK;
|
||||
}
|
||||
|
||||
@@ -142,7 +153,9 @@
|
||||
|
||||
g_mutex_free (src->mutex);
|
||||
|
||||
- G_OBJECT_CLASS (parent_class)->finalize (object);
|
||||
+ gst_object_unref (src->clock);
|
||||
+
|
||||
+ G_OBJECT_CLASS (cinnamon_recorder_src_parent_class)->finalize (object);
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -246,9 +259,9 @@
|
||||
g_return_if_fail (CINNAMON_IS_RECORDER_SRC (src));
|
||||
g_return_if_fail (src->caps != NULL);
|
||||
|
||||
- gst_buffer_set_caps (buffer, src->caps);
|
||||
+ gst_base_src_set_caps (GST_BASE_SRC (src), src->caps);
|
||||
cinnamon_recorder_src_update_memory_used (src,
|
||||
- (int) (GST_BUFFER_SIZE(buffer) / 1024));
|
||||
+ (int)(gst_buffer_get_size(buffer) / 1024));
|
||||
|
||||
g_async_queue_push (src->queue, gst_buffer_ref (buffer));
|
||||
}
|
||||
diff -ruN a/src/test-recorder.c b/src/test-recorder.c
|
||||
--- a/src/test-recorder.c 2013-10-16 15:10:22.240845159 +0000
|
||||
+++ b/src/test-recorder.c 2013-10-16 15:48:03.685915756 +0000
|
||||
@@ -1,5 +1,6 @@
|
||||
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
||||
|
||||
+#define GST_USE_UNSTABLE_API
|
||||
#include "cinnamon-recorder.h"
|
||||
#include <clutter/clutter.h>
|
||||
#include <gst/gst.h>
|
||||
@@ -29,7 +30,6 @@
|
||||
ClutterAnimation *animation;
|
||||
ClutterColor red, green, blue;
|
||||
|
||||
- g_thread_init (NULL);
|
||||
gst_init (&argc, &argv);
|
||||
if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
|
||||
return 1;
|
||||
11
srcpkgs/cinnamon/patches/input_keybindings.patch
Normal file
11
srcpkgs/cinnamon/patches/input_keybindings.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
--- a/files/usr/lib/cinnamon-settings/modules/cs_keyboard.py
|
||||
+++ b/files/usr/lib/cinnamon-settings/modules/cs_keyboard.py
|
||||
@@ -119,6 +119,8 @@ KEYBINDINGS = [
|
||||
[_("Log out"), MEDIA_KEYS_SCHEMA, "logout", False, "system"],
|
||||
[_("Lock screen"), MEDIA_KEYS_SCHEMA, "screensaver", False, "system"],
|
||||
[_("Toggle recording desktop (must restart Cinnamon)"), MUFFIN_KEYBINDINGS_SCHEMA, "toggle-recording", True, "system"],
|
||||
+ [_("Switch to next source"), MEDIA_KEYS_SCHEMA, "switch-input-source", False, "system"],
|
||||
+ [_("Switch to previous source"), MEDIA_KEYS_SCHEMA, "switch-input-source-backward", False, "system"],
|
||||
|
||||
# Launchers
|
||||
[_("Launch help browser"), MEDIA_KEYS_SCHEMA, "help", False, "launchers"],
|
||||
133
srcpkgs/cinnamon/patches/keyboard_applet.patch
Normal file
133
srcpkgs/cinnamon/patches/keyboard_applet.patch
Normal file
|
|
@ -0,0 +1,133 @@
|
|||
--- a/files/usr/share/cinnamon/applets/keyboard@cinnamon.org/applet.js
|
||||
+++ b/files/usr/share/cinnamon/applets/keyboard@cinnamon.org/applet.js
|
||||
@@ -1,9 +1,10 @@
|
||||
const Applet = imports.ui.applet;
|
||||
-const Gkbd = imports.gi.Gkbd;
|
||||
const Lang = imports.lang;
|
||||
-const Cinnamon = imports.gi.Cinnamon;
|
||||
+const Gio = imports.gi.Gio;
|
||||
+const GLib = imports.gi.GLib;
|
||||
const St = imports.gi.St;
|
||||
const Gtk = imports.gi.Gtk;
|
||||
+const CinnamonDesktop = imports.gi.CinnamonDesktop;
|
||||
const Main = imports.ui.main;
|
||||
const PopupMenu = imports.ui.popupMenu;
|
||||
const Util = imports.misc.util;
|
||||
@@ -16,11 +17,12 @@ function LayoutMenuItem() {
|
||||
LayoutMenuItem.prototype = {
|
||||
__proto__: PopupMenu.PopupBaseMenuItem.prototype,
|
||||
|
||||
- _init: function(config, id, indicator, long_name) {
|
||||
+ _init: function(ipsettings, id, index, indicator, long_name) {
|
||||
PopupMenu.PopupBaseMenuItem.prototype._init.call(this);
|
||||
|
||||
- this._config = config;
|
||||
+ this._ipsettings = ipsettings;
|
||||
this._id = id;
|
||||
+ this._index = index;
|
||||
this.label = new St.Label({ text: long_name });
|
||||
this.indicator = indicator;
|
||||
this.addActor(this.label);
|
||||
@@ -29,7 +31,7 @@ LayoutMenuItem.prototype = {
|
||||
|
||||
activate: function(event) {
|
||||
PopupMenu.PopupBaseMenuItem.prototype.activate.call(this);
|
||||
- this._config.lock_group(this._id);
|
||||
+ this._ipsettings.set_value('current', GLib.Variant.new_uint32(this._index));
|
||||
}
|
||||
};
|
||||
|
||||
@@ -62,18 +64,18 @@ MyApplet.prototype = {
|
||||
this._syncConfig,
|
||||
null);
|
||||
|
||||
- this._config = Gkbd.Configuration.get();
|
||||
- this._config.connect('changed', Lang.bind(this, this._syncConfig));
|
||||
- this._config.connect('group-changed', Lang.bind(this, this._syncGroup));
|
||||
+ this._xkbInfo = new CinnamonDesktop.XkbInfo();
|
||||
+ this._ipsettings = new Gio.Settings({ schema: 'org.cinnamon.desktop.input-sources' });
|
||||
+ this._ipsettings.connect('changed::sources', Lang.bind(this, this._syncConfig));
|
||||
+ this._ipsettings.connect('changed::current', Lang.bind(this, this._syncGroup));
|
||||
|
||||
- this._config.start_listen();
|
||||
|
||||
this._syncConfig();
|
||||
|
||||
this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
|
||||
this.menu.addAction(_("Show Keyboard Layout"), Lang.bind(this, function() {
|
||||
Main.overview.hide();
|
||||
- Util.spawn(['gkbd-keyboard-display', '-g', String(this._config.get_current_group() + 1)]);
|
||||
+ Util.spawn(['gkbd-keyboard-display', '-l', this._selectedLayout._id]);
|
||||
}));
|
||||
this.menu.addAction(_("Show Character Table"), Lang.bind(this, function() {
|
||||
Main.overview.hide();
|
||||
@@ -113,8 +115,8 @@ MyApplet.prototype = {
|
||||
},
|
||||
|
||||
_syncConfig: function() {
|
||||
- let groups = this._config.get_group_names();
|
||||
- if (groups.length > 1) {
|
||||
+ let sources = this._ipsettings.get_value('sources');
|
||||
+ if (sources.n_children() > 1) {
|
||||
this.actor.show();
|
||||
} else {
|
||||
this.menu.close();
|
||||
@@ -127,25 +129,30 @@ MyApplet.prototype = {
|
||||
for (let i = 0; i < this._labelActors.length; i++)
|
||||
this._labelActors[i].destroy();
|
||||
|
||||
- let short_names = this._adjustGroupNames(this._config.get_short_group_names());
|
||||
|
||||
this._selectedLayout = null;
|
||||
this._layoutItems = [ ];
|
||||
this._labelActors = [ ];
|
||||
- for (let i = 0; i < groups.length; i++) {
|
||||
- let icon_name = this._config.get_group_name(i);
|
||||
+ for (let i = 0; i < sources.n_children(); i++) {
|
||||
+ let [type, id] = sources.get_child_value(i).deep_unpack();
|
||||
+ let displayName = id;
|
||||
+ let shortName = id;
|
||||
+ let xkbLayout = id;
|
||||
+ if (type == 'xkb') {
|
||||
+ [_exists, displayName, shortName, xkbLayout, _xkbVariant] = this._xkbInfo.get_layout_info(id);
|
||||
+ } // TODO: errorhandling, handle 'ibus'
|
||||
+ let icon_name = xkbLayout; // FIXME: Really?
|
||||
let actor;
|
||||
if (this._showFlags)
|
||||
actor = new St.Icon({ icon_name: icon_name, icon_type: St.IconType.FULLCOLOR, style_class: 'popup-menu-icon' });
|
||||
else
|
||||
- actor = new St.Label({ text: short_names[i] });
|
||||
- let item = new LayoutMenuItem(this._config, i, actor, groups[i]);
|
||||
- item._short_group_name = short_names[i];
|
||||
+ actor = new St.Label({ text: shortName });
|
||||
+ let item = new LayoutMenuItem(this._ipsettings, id, i, actor, displayName);
|
||||
item._icon_name = icon_name;
|
||||
this._layoutItems.push(item);
|
||||
this.menu.addMenuItem(item, i);
|
||||
|
||||
- let shortLabel = new St.Label({ text: short_names[i] });
|
||||
+ let shortLabel = new St.Label({ text: shortName });
|
||||
this._labelActors.push(shortLabel);
|
||||
}
|
||||
|
||||
@@ -153,17 +160,17 @@ MyApplet.prototype = {
|
||||
},
|
||||
|
||||
_syncGroup: function() {
|
||||
- let selected = this._config.get_current_group();
|
||||
+ let current = this._ipsettings.get_uint('current');
|
||||
|
||||
if (this._selectedLayout) {
|
||||
this._selectedLayout.setShowDot(false);
|
||||
this._selectedLayout = null;
|
||||
}
|
||||
|
||||
- let item = this._layoutItems[selected];
|
||||
+ let item = this._layoutItems[current];
|
||||
item.setShowDot(true);
|
||||
|
||||
- let selectedLabel = this._labelActors[selected];
|
||||
+ let selectedLabel = this._labelActors[current];
|
||||
|
||||
if (this._showFlags) {
|
||||
this.set_applet_icon_name(item._icon_name);
|
||||
64
srcpkgs/cinnamon/template
Normal file
64
srcpkgs/cinnamon/template
Normal file
|
|
@ -0,0 +1,64 @@
|
|||
# Template file for 'cinnamon'
|
||||
#
|
||||
_RUNTIMEDEPS="
|
||||
accountsservice caribou cinnamon-settings-daemon cinnamon-session muffin
|
||||
cinnamon-control-center cinnamon-screensaver cinnamon-translations nemo
|
||||
gnome-icon-theme gnome-themes-standard librsvg network-manager-applet
|
||||
pygtk dbus-python python-pam python-pexpect python-inotify
|
||||
python-lxml python-imaging network-manager-applet polkit-gnome"
|
||||
|
||||
pkgname=cinnamon
|
||||
version=2.0.14
|
||||
revision=1
|
||||
patch_args="-Np1"
|
||||
short_desc="GNOME3 fork of Linux Mint with GNOME2 aspect"
|
||||
build_style=gnu-configure
|
||||
configure_args="--disable-static --disable-schemas-compile --enable-compile-warnings=no"
|
||||
hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection
|
||||
gettext-devel intltool which xmlto docbook-xml gtk-doc"
|
||||
makedepends="cjs-devel clutter-gtk-devel gnome-menus-devel gstreamer1-devel
|
||||
muffin-devel webkitgtk-devel libgnomekbd-devel polkit-devel libcanberra-devel
|
||||
startup-notification-devel pulseaudio-devel dbus-glib-devel GConf-devel
|
||||
libgnome-keyring-devel NetworkManager-devel libcroco-devel ${_RUNTIMEDEPS}"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
license="GPL-3"
|
||||
homepage="http://cinnamon.linuxmint.com/"
|
||||
|
||||
do_fetch() {
|
||||
git clone -b ${version} git://github.com/linuxmint/Cinnamon ${pkgname}-${version}
|
||||
}
|
||||
|
||||
pre_configure() {
|
||||
# Fix required components
|
||||
sed -i 's/cinnamon-fallback-mount-helper;/polkit-cinnamon-authentication-agent-1;/' files/usr/share/cinnamon-session/sessions/cinnamon*.session
|
||||
|
||||
# fix for the python2 PAM module
|
||||
sed -i 's:import PAM:import pam:' files/usr/lib/cinnamon-settings/modules/cs_user.py
|
||||
|
||||
# Use pkexec instead of gksu
|
||||
sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users
|
||||
|
||||
# Check for the cc-panel path, not for the unneeded binary
|
||||
sed -i 's|/usr/bin/cinnamon-control-center|/usr/lib/cinnamon-control-center-1/panels|' files/usr/bin/cinnamon-settings
|
||||
|
||||
# Cinnamon has no upstream backgrounds, use GNOME backgrounds instead
|
||||
sed -i 's|/usr/share/cinnamon-background-properties|/usr/share/gnome-background-properties|' \
|
||||
files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py
|
||||
|
||||
# Prefix 'System Settings' with 'Cinnamon' to avoid confusion with gnome-control-center
|
||||
sed -i 's/^Name\(.*\)=\(.*\)/Name\1=Cinnamon \2/' files/usr/share/applications/cinnamon-settings{,-users}.desktop
|
||||
|
||||
NOCONFIGURE=1 ./autogen.sh
|
||||
}
|
||||
|
||||
post_install() {
|
||||
vinstall ${FILESDIR}/org.cinnamon.settings-users.policy 644 usr/share/polkit-1/actions
|
||||
vinstall ${FILESDIR}//polkit-cinnamon-authentication-agent-1.desktop 644 usr/share/applications
|
||||
}
|
||||
|
||||
cinnamon_package() {
|
||||
depends="${_RUNTIMEDEPS}"
|
||||
pkg_install() {
|
||||
vmove all
|
||||
}
|
||||
}
|
||||
1
srcpkgs/cjs-devel
Symbolic link
1
srcpkgs/cjs-devel
Symbolic link
|
|
@ -0,0 +1 @@
|
|||
cjs
|
||||
36
srcpkgs/cjs/template
Normal file
36
srcpkgs/cjs/template
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
# Template file for 'cjs'
|
||||
pkgname=cjs
|
||||
version=2.0.0
|
||||
revision=3
|
||||
short_desc="Javascript for Cinnamon"
|
||||
build_style=gnu-configure
|
||||
configure_args=" --disable-static"
|
||||
hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection"
|
||||
makedepends="js-devel dbus-glib-devel readline-devel"
|
||||
maintainer="Roelof Wobben <rwobben@hotmail.com>"
|
||||
license="GPL-3"
|
||||
homepage="http://cinnamon.linuxmint.com/"
|
||||
|
||||
do_fetch() {
|
||||
git clone -b ${version} git://github.com/linuxmint/${pkgname} ${pkgname}-${version}
|
||||
}
|
||||
|
||||
pre_configure() {
|
||||
./autogen.sh
|
||||
}
|
||||
|
||||
cjs-devel_package() {
|
||||
depends="js-devel libglib-devel dbus-devel ${sourcepkg}>=${version}_${revision}"
|
||||
short_desc+=" - development files"
|
||||
pkg_install() {
|
||||
vmove "usr/lib/*.so"
|
||||
vmove usr/include
|
||||
vmove usr/lib/pkgconfig
|
||||
}
|
||||
}
|
||||
|
||||
cjs_package() {
|
||||
pkg_install() {
|
||||
vmove all
|
||||
}
|
||||
}
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'coreutils'
|
||||
pkgname=coreutils
|
||||
version=8.21
|
||||
revision=3
|
||||
version=8.22
|
||||
revision=1
|
||||
hostmakedepends="perl"
|
||||
makedepends="gmp-devel acl-devel libcap-devel"
|
||||
short_desc="The GNU core utilities"
|
||||
|
|
@ -9,7 +9,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
|
|||
homepage="http://www.gnu.org/software/coreutils"
|
||||
license="GPL-3"
|
||||
distfiles="http://ftp.gnu.org/gnu/coreutils/${pkgname}-${version}.tar.xz"
|
||||
checksum=adaa44bdab3fa5eb352e80d8a31fdbf957b78653d0c2cd30d63e161444288e18
|
||||
checksum=5b3e94998152c017e6c75d56b9b994188eb71bf46d4038a642cb9141f6ff1212
|
||||
|
||||
do_configure() {
|
||||
if [ "$CROSS_BUILD" ]; then
|
||||
|
|
@ -57,14 +57,14 @@ coreutils_package() {
|
|||
conflicts="chroot-coreutils>=0 procps-ng<3.3.5_3"
|
||||
depends="coreutils-doc-${version}_${revision}"
|
||||
pkg_install() {
|
||||
vmove usr
|
||||
vmove all
|
||||
}
|
||||
}
|
||||
|
||||
if [ -z "$CROSS_BUILD" ]; then
|
||||
coreutils-doc_package() {
|
||||
noarch=yes
|
||||
short_desc+=" -- documentation files"
|
||||
short_desc+=" - documentation files"
|
||||
replaces="coreutils<8.20_4"
|
||||
pkg_install() {
|
||||
vmove usr/share/info
|
||||
|
|
|
|||
|
|
@ -1,22 +1,20 @@
|
|||
# Template file for 'econnman'
|
||||
pkgname=econnman
|
||||
version=1
|
||||
revision=2
|
||||
version=1.1
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
# XXX
|
||||
configure_args="PY_EFL_CFLAGS=-Os PY_EFL_LIBS=-lefl"
|
||||
hostmakedepends="pkg-config"
|
||||
makedepends="python-efl connman"
|
||||
makedepends="efl-devel python-efl connman desktop-file-utils"
|
||||
homepage="http://enlightenment.org"
|
||||
short_desc="Enlightenment ConnMan user interface"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
license="LGPL-3"
|
||||
distfiles="http://packages.profusion.mobi/$pkgname/$pkgname-$version.tar.gz"
|
||||
checksum=3e2724423d6cfe24dca6bf34bbc340fb71ecf2e569346c92978593320128f02d
|
||||
distfiles="http://download.enlightenment.org/rel/apps/econnman/econnman-${version}.tar.gz"
|
||||
checksum=60f30748b2642b83763fe1e00f6a54ff27425c761633bb8cc0396fba15e7f714
|
||||
|
||||
econnman_package() {
|
||||
noarch=yes
|
||||
depends="python-efl connman"
|
||||
depends="python-efl connman desktop-file-utils"
|
||||
pkg_install() {
|
||||
vmove all
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'enlightenment'
|
||||
pkgname=enlightenment
|
||||
_distver=0.18.0
|
||||
_patchver=rc1
|
||||
_patchver=rc2
|
||||
version="${_distver}${_patchver}"
|
||||
wrksrc="${pkgname}-${_distver}-${_patchver}"
|
||||
revision=1
|
||||
|
|
@ -15,8 +15,8 @@ homepage="http://enlightenment.org"
|
|||
short_desc="Enlightenment desktop"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
license="BSD"
|
||||
distfiles="http://download.enlightenment.org/rel/apps/${pkgname}/${pkgname}-${_distver}-${_patchver}.tar.bz2"
|
||||
checksum=42b23fb11a60c2f79ae293e4d33f78248279425aab1183eb7b63363d99330758
|
||||
distfiles="http://download.enlightenment.org/releases/${pkgname}-${_distver}-${_patchver}.tar.bz2"
|
||||
checksum=d6d9344d989b1aa3597a14c63eb16c04a9e81f09d3124e410dd5a56a13bbe817
|
||||
|
||||
post_install() {
|
||||
vmkdir usr/share/licenses/${pkgname}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,35 @@
|
|||
From 0290fd97a964214289303a8b9d7e184ef9fc818b Mon Sep 17 00:00:00 2001
|
||||
From: Juan RP <xtraeme@gmail.com>
|
||||
Date: Sat, 14 Dec 2013 07:00:00 +0100
|
||||
Subject: [PATCH] scripts/fakechroot.sh: fix -h and others (die ->
|
||||
fakechroot_die).
|
||||
|
||||
---
|
||||
scripts/fakechroot.sh | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/scripts/fakechroot.sh b/scripts/fakechroot.sh
|
||||
index 1f11720..7738153 100644
|
||||
--- scripts/fakechroot.sh
|
||||
+++ scripts/fakechroot.sh
|
||||
@@ -17,7 +17,7 @@ fakechroot_die () {
|
||||
|
||||
|
||||
fakechroot_usage () {
|
||||
- die "Usage:
|
||||
+ fakechroot_die "Usage:
|
||||
fakechroot [-l|--lib fakechrootlib] [-d|--elfloader ldso]
|
||||
[-s|--use-system-libs]
|
||||
[-e|--environment type] [-c|--config-dir directory]
|
||||
@@ -60,7 +60,7 @@ fakechroot_next_cmd () {
|
||||
|
||||
|
||||
if [ "$FAKECHROOT" = "true" ]; then
|
||||
- die "fakechroot: nested operation is not supported"
|
||||
+ fakechroot_die "fakechroot: nested operation is not supported"
|
||||
fi
|
||||
|
||||
|
||||
--
|
||||
1.8.5.1
|
||||
|
||||
|
|
@ -0,0 +1,44 @@
|
|||
From 922b9be90ccce8f5b01339864f499f6d77505c5f Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Gregory <andrew.gregory.8@gmail.com>
|
||||
Date: Fri, 13 Dec 2013 12:31:00 -0500
|
||||
Subject: [PATCH] chroot: sanitize path
|
||||
|
||||
path was not being sanitized if it started with '/' causing chroot calls
|
||||
to fail when path ended with '/'.
|
||||
|
||||
Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
|
||||
---
|
||||
src/chroot.c | 3 +++
|
||||
test/t/chroot.t | 2 +-
|
||||
2 files changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/chroot.c b/src/chroot.c
|
||||
index 9e15ff5..7917a9a 100644
|
||||
--- src/chroot.c
|
||||
+++ src/chroot.c
|
||||
@@ -76,6 +76,9 @@
|
||||
else {
|
||||
if (*path == '/') {
|
||||
expand_chroot_rel_path(path);
|
||||
+ strlcpy(tmp, path, FAKECHROOT_PATH_MAX);
|
||||
+ dedotdot(tmpptr);
|
||||
+ path = tmpptr;
|
||||
}
|
||||
else {
|
||||
snprintf(tmp, FAKECHROOT_PATH_MAX, "%s/%s", cwd, path);
|
||||
diff --git a/test/t/chroot.t b/test/t/chroot.t
|
||||
index e532a6f..286b863 100755
|
||||
--- test/t/chroot.t
|
||||
+++ test/t/chroot.t
|
||||
@@ -14,7 +14,7 @@ for chroot in chroot fakechroot; do
|
||||
skip $(( $tap_plan / 2 )) "not root"
|
||||
else
|
||||
|
||||
- for testtree in testtree2 /testtree2 ./testtree2 /./testtree2 testtree2/. testtree2/./.; do
|
||||
+ for testtree in testtree2 /testtree2 ./testtree2 /./testtree2 testtree2/. testtree2/./. testtree2/; do
|
||||
t=`$srcdir/$chroot.sh testtree /usr/sbin/chroot $testtree /bin/cat /CHROOT 2>&1`
|
||||
test "$t" = "testtree/testtree2" || not
|
||||
ok "$chroot chroot $testtree:" $t
|
||||
--
|
||||
1.8.5.1
|
||||
|
||||
|
|
@ -1,17 +1,17 @@
|
|||
# Template file for 'fakechroot'
|
||||
pkgname=fakechroot
|
||||
version=2.16
|
||||
revision=1
|
||||
version=2.17.1
|
||||
revision=2
|
||||
build_style=gnu-configure
|
||||
configure_args="--disable-static --sbindir=/usr/bin"
|
||||
short_desc="Gives a fake chroot environment"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
homepage="https://github.com/fakechroot/fakechroot"
|
||||
homepage="https://github.com/dex4er/fakechroot"
|
||||
license="LGPL-2.1"
|
||||
distfiles="https://github.com/downloads/fakechroot/fakechroot/fakechroot-${version}.tar.gz"
|
||||
checksum=81c105e0878b55fbcf430235badcb31249d86ac435297910f411d9955dadf9c6
|
||||
long_desc="
|
||||
This package provides a library which overrides libc functions, so it is
|
||||
possible to use root-specific tools without root privileges."
|
||||
|
||||
do_fetch() {
|
||||
git clone -b ${version} git://github.com/dex4er/fakechroot ${pkgname}-${version}
|
||||
}
|
||||
|
||||
fakechroot_package() {
|
||||
conf_files="
|
||||
|
|
@ -19,7 +19,6 @@ fakechroot_package() {
|
|||
/etc/fakechroot/debootstrap.env
|
||||
/etc/fakechroot/rinse.env"
|
||||
pkg_install() {
|
||||
vmove etc
|
||||
vmove usr
|
||||
vmove all
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'file'
|
||||
pkgname=file
|
||||
version=5.15
|
||||
version=5.16
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--enable-static"
|
||||
|
|
@ -10,7 +10,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
|
|||
homepage="http://www.darwinsys.com/file/"
|
||||
license="BSD"
|
||||
distfiles="ftp://ftp.astron.com/pub/file/file-${version}.tar.gz"
|
||||
checksum=4bd52cc614d6488127c0bddc208a2855481744d76ff0878d9c173d2a6ed564e4
|
||||
checksum=48bcac7726c37a8a0bc7ffa16b58993575657dd7b382039380fb3b74ab389261
|
||||
|
||||
libmagic_package() {
|
||||
short_desc="File type identification library"
|
||||
|
|
|
|||
|
|
@ -1,12 +0,0 @@
|
|||
--- lib/fribidi-types.h.orig 2006/01/31 03:23:13 1.12
|
||||
+++ lib/fribidi-types.h 2010/02/24 19:40:04 1.13
|
||||
@@ -40,8 +40,7 @@
|
||||
|
||||
#if FRIBIDI_USE_GLIB+0
|
||||
# ifndef __FRIBIDI_DOC
|
||||
-# include <glib/gtypes.h>
|
||||
-# include <glib/gunicode.h>
|
||||
+# include <glib.h>
|
||||
# endif /* !__FRIBIDI_DOC */
|
||||
# define FRIBIDI_INT8_LOCAL gint8
|
||||
# define FRIBIDI_INT16_LOCAL gint16
|
||||
|
|
@ -1,35 +1,30 @@
|
|||
# Template file for 'fribidi'
|
||||
pkgname=fribidi
|
||||
version=0.19.2
|
||||
revision=7
|
||||
version=0.19.6
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
hostmakedepends="pkg-config"
|
||||
makedepends="glib-devel"
|
||||
short_desc="Free Implementation of the Unicode Bidirectional Algorithm"
|
||||
homepage="http://fribidi.org/"
|
||||
license="LGPL-2.1"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
distfiles="http://fribidi.org/download/$pkgname-$version.tar.gz"
|
||||
checksum=49cf91586e48b52fe25872ff66c1da0dff0daac2593f9f300e2af12f44f64177
|
||||
long_desc="
|
||||
The library implements all of the algorithm as described in the Unicode
|
||||
Standard Annex 9, The Bidirectional Algorithm,
|
||||
http://www.unicode.org/unicode/reports/tr9/. FriBidi is exhautively tested
|
||||
against Bidi Reference Code, and due to our best knowledge, does not contain
|
||||
any conformance bugs."
|
||||
distfiles="http://fribidi.org/download/$pkgname-$version.tar.bz2"
|
||||
checksum=cba8b7423c817e5adf50d28ec9079d14eafcec9127b9e8c8f1960c5ad585e17d
|
||||
|
||||
fribidi-devel_package() {
|
||||
depends="glib-devel fribidi>=${version}"
|
||||
short_desc+=" -- development files"
|
||||
depends="glib-devel fribidi>=${version}_${revision}"
|
||||
short_desc+=" - development files"
|
||||
pkg_install() {
|
||||
vmove usr/include
|
||||
vmove usr/lib/pkgconfig
|
||||
vmove "usr/lib/*.a"
|
||||
vmove "usr/lib/*.so"
|
||||
vmove usr/share
|
||||
}
|
||||
}
|
||||
|
||||
fribidi_package() {
|
||||
pkg_install() {
|
||||
vmove usr
|
||||
vmove all
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,22 +1,14 @@
|
|||
# Template file for 'fs-utils'.
|
||||
pkgname=fs-utils
|
||||
version=v1.00
|
||||
version=v1.10
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--disable-static"
|
||||
makedepends="netbsd-rumpkernel-devel>=20130702"
|
||||
makedepends="netbsd-rumpkernel-devel>=201312"
|
||||
short_desc="NetBSD File System Access Utilities in Userland"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
license="BSD"
|
||||
homepage="https://github.com/stacktic/fs-utils"
|
||||
long_desc="
|
||||
The aim of this project is to have a set of utilities to access and modify a
|
||||
file system image without having to mount it. To use fs-utils you do not
|
||||
have to be root, you just need read/write access to the image or device.
|
||||
The advantage of fs-utils over similar projects such as mtools is supporting
|
||||
the usage of familiar Unix tools (ls, cp, mv, etc.) for a large number of
|
||||
file systems."
|
||||
|
||||
|
||||
do_fetch() {
|
||||
local url="git://github.com/stacktic/fs-utils.git"
|
||||
|
|
|
|||
20
srcpkgs/fuse-archivemount/template
Normal file
20
srcpkgs/fuse-archivemount/template
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
# Template file for 'fuse-archivemount'
|
||||
pkgname=fuse-archivemount
|
||||
version=0.8.3
|
||||
revision=1
|
||||
wrksrc="${pkgname/fuse-/}-${version}"
|
||||
build_style=gnu-configure
|
||||
hostmakedepends="pkg-config"
|
||||
makedepends="fuse-devel libarchive-devel"
|
||||
short_desc="Mounts an archive for access as a file system"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
license="LGPL-2"
|
||||
homepage="http://www.cybernoia.de/software/archivemount/"
|
||||
distfiles="${homepage}/${pkgname/fuse-/}-${version}.tar.gz"
|
||||
checksum=e78899a8b7c9cb43fa4526d08c54a9e171475c00bf095770b8779a33e37661ff
|
||||
|
||||
fuse-archivemount_package() {
|
||||
pkg_install() {
|
||||
vmove all
|
||||
}
|
||||
}
|
||||
|
|
@ -1,30 +1,16 @@
|
|||
# Template file for 'gdb'
|
||||
pkgname=gdb
|
||||
version=7.6.1
|
||||
version=7.6.2
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--disable-nls --with-system-readline
|
||||
--with-system-gdbinit=/etc/gdb/gdbinit"
|
||||
configure_args="--disable-nls --with-system-readline --with-system-gdbinit=/etc/gdb/gdbinit"
|
||||
makedepends="ncurses-devel zlib-devel readline-devel"
|
||||
short_desc="The GNU Debugger"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
homepage="http://www.gnu.org/software/gdb/"
|
||||
license="GPL-3"
|
||||
distfiles="http://ftp.gnu.org/gnu/gdb/gdb-$version.tar.bz2"
|
||||
checksum=e3dfa38a14a5457f9b8b26f7b5080ba5491bd10ae4d69bfe357cea87b7d162e4
|
||||
long_desc="
|
||||
The purpose of a debugger such as GDB is to allow you to see what
|
||||
is going on inside another program while it executes--or what
|
||||
another program was doing at the moment it crashed.
|
||||
|
||||
GDB can do four main kinds of things (plus other things in support
|
||||
of these) to help you catch bugs in the act:
|
||||
|
||||
* Start your program, specifying anything that might affect its behavior.
|
||||
* Make your program stop on specified conditions.
|
||||
* Examine what has happened, when your program has stopped.
|
||||
* Change things in your program, so you can experiment with correcting the
|
||||
effects of one bug and go on to learn about another."
|
||||
checksum=2f6a0e2ce1c66c9dedeb7f58a8d1298ad602ddcdaf15d23104e1f7832b96d0e8
|
||||
|
||||
# Package build options
|
||||
build_options="gdbserver static"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Template build file for 'gdk-pixbuf'.
|
||||
pkgname=gdk-pixbuf
|
||||
version=2.30.1
|
||||
version=2.30.2
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--without-libjasper --with-included-loaders=png --with-x11"
|
||||
|
|
@ -11,7 +11,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
|
|||
homepage="http://www.gtk.org/"
|
||||
license="GPL-2"
|
||||
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
|
||||
checksum=a3263b1e15668c009313bf04ab67420bec9f2b167c402a71a486307cadee8d30
|
||||
checksum=cababfa075a9a60426809309ec86b82ea28e83f44ef69c898e48c040b6feecbf
|
||||
|
||||
if [ "$CROSS_BUILD" ]; then
|
||||
# needs glib-mkenums
|
||||
|
|
|
|||
14
srcpkgs/gparted/INSTALL
Normal file
14
srcpkgs/gparted/INSTALL
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
case "${ACTION}" in
|
||||
post)
|
||||
cat <<_EOF
|
||||
=======================================================================
|
||||
|
||||
To run gparted through a desktop menu, a polkit authentication agent
|
||||
must be running; for GNOME and KDE users it should be already installed,
|
||||
otherwise you can install *lxpolkit* which is a lightweight polkit
|
||||
authentication agent.
|
||||
|
||||
=======================================================================
|
||||
_EOF
|
||||
;;
|
||||
esac
|
||||
|
|
@ -1,3 +1,3 @@
|
|||
#!/bin/sh
|
||||
|
||||
pkexec /usr/sbin/gparted "$@"
|
||||
pkexec --disable-internal-agent "/usr/bin/gparted" "$@"
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
<allow_inactive>auth_admin</allow_inactive>
|
||||
<allow_active>auth_admin</allow_active>
|
||||
</defaults>
|
||||
<annotate key="org.freedesktop.policykit.exec.path">/usr/sbin/gparted</annotate>
|
||||
<annotate key="org.freedesktop.policykit.exec.path">/usr/bin/gparted</annotate>
|
||||
<annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
|
||||
</action>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,15 +1,17 @@
|
|||
# Template file for 'gparted'
|
||||
pkgname=gparted
|
||||
version=0.16.2
|
||||
revision=1
|
||||
version=0.17.0
|
||||
revision=2
|
||||
build_style=gnu-configure
|
||||
configure_args="--disable-scrollkeeper --enable-libparted-dmraid"
|
||||
configure_args="--enable-libparted-dmraid --sbindir=/usr/bin"
|
||||
hostmakedepends="pkg-config which intltool gnome-doc-utils"
|
||||
makedepends="libuuid-devel libparted-devel gtkmm2-devel"
|
||||
short_desc="Gnome Partition Editor"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
homepage="http://gparted.sourceforge.net"
|
||||
license="GPL-2"
|
||||
distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
|
||||
checksum=fc8fd3c5c2153c063bd2fdbfb54e525b72e2ceb8d060f8bb60e3386bb6f35d72
|
||||
checksum=81ab2114569c9692b7dfea62b320b333b832dd595faffdb67b3321606bc6fbc3
|
||||
long_desc="
|
||||
GParted is a free partition editor for graphically managing your disk
|
||||
partitions.
|
||||
|
|
@ -22,19 +24,17 @@ long_desc="
|
|||
partitions. GParted enables you to reorganize your disk partitions while
|
||||
preserving the contents of these partitions."
|
||||
|
||||
hostmakedepends="pkg-config which intltool gnome-doc-utils"
|
||||
makedepends="libuuid-devel libparted-devel gtkmm2-devel"
|
||||
pre_configure() {
|
||||
sed -i "s:@gksuprog@ @installdir@/gparted %f:@installdir@/gparted-pkexec %f:g" gparted.desktop.in.in
|
||||
}
|
||||
|
||||
post_install() {
|
||||
vinstall ${FILESDIR}/org.void.pkexec.gparted.policy \
|
||||
644 /usr/share/polkit-1/actions
|
||||
vinstall ${FILESDIR}/org.void.pkexec.gparted.policy 644 /usr/share/polkit-1/actions
|
||||
vinstall ${FILESDIR}/gparted-pkexec 755 usr/bin
|
||||
sed -i -e "s/Exec=.*/Exec=gparted-pkexec/" \
|
||||
${DESTDIR}/usr/share/applications/gparted.desktop
|
||||
}
|
||||
|
||||
gparted_package() {
|
||||
depends="hicolor-icon-theme desktop-file-utils polkit"
|
||||
depends="hicolor-icon-theme desktop-file-utils"
|
||||
pkg_install() {
|
||||
vmove all
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
# Template file for 'kactivities'
|
||||
pkgname=kactivities
|
||||
version=4.11.1
|
||||
version=4.11.4
|
||||
revision=1
|
||||
short_desc="KDE API for using and interacting with the Activity Manager"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
license="GPL, LGPL, FDL"
|
||||
homepage="https://projects.kde.org/projects/kde/kactivities"
|
||||
distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz"
|
||||
checksum=1edfc79b9c8948d6733860d1d8765764169642f96a27f206449724ab9b0c1397
|
||||
checksum=b1c70ddf8bf20e08b2a32ccbe014a3ebf68b1cf4e7bea6850bfc5d61aaaa1576
|
||||
|
||||
build_style=cmake
|
||||
configure_args="-DKDE4_BUILD_TESTS=OFF"
|
||||
|
|
@ -18,7 +18,7 @@ makedepends="MesaLib-devel qt-devel phonon-devel kdelibs-devel>=${version}
|
|||
|
||||
kactivities-devel_package() {
|
||||
short_desc+=" - development files"
|
||||
depends="${sourcepkg}-${version}_${revision}"
|
||||
depends="${sourcepkg}>=${version}_${revision}"
|
||||
pkg_install() {
|
||||
vmove usr/include
|
||||
vmove usr/lib/cmake
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'kde-base-artwork'
|
||||
pkgname=kde-base-artwork
|
||||
version=4.11.1
|
||||
version=4.11.4
|
||||
revision=1
|
||||
build_style=cmake
|
||||
hostmakedepends="cmake automoc4 pkg-config"
|
||||
|
|
@ -10,7 +10,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
|
|||
license="GPL, LGPL, FDL"
|
||||
homepage="http://www.kde.org"
|
||||
distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz"
|
||||
checksum=81f8681b014aceaf2a6e1a44ddf6127f68f20e646c3f315919b6194b339b6ee2
|
||||
checksum=1464aeeb41d27ad276173c499772d1029ddc07b7a83f970d98856d036d149a45
|
||||
|
||||
kde-base-artwork_package() {
|
||||
noarch=yes
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
# Template file for 'kde-baseapps'
|
||||
pkgname=kde-baseapps
|
||||
version=4.11.1
|
||||
version=4.11.4
|
||||
revision=1
|
||||
short_desc="KDE base applications"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
license="GPL, LGPL, FDL"
|
||||
homepage="http://www.kde.org"
|
||||
distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz"
|
||||
checksum=f382f84d34dbb696533b026aa082987a9603584b5e92874ab94df9764a69fd91
|
||||
checksum=d62d6e5d702ccb8b6092208939a7be4619deeabcbde9c71ee355726d6f194396
|
||||
|
||||
build_style=cmake
|
||||
configure_args="-DKDE4_BUILD_TESTS=OFF"
|
||||
|
|
@ -21,7 +21,7 @@ makedepends="glib-devel openssl-devel qt-devel phonon-devel strigi-devel
|
|||
|
||||
kde-baseapps-devel_package() {
|
||||
short_desc+=" - development files"
|
||||
depends="${sourcepkg}-${version}_${revision}"
|
||||
depends="${sourcepkg}>=${version}_${revision}"
|
||||
pkg_install() {
|
||||
vmove usr/include
|
||||
}
|
||||
|
|
|
|||
1
srcpkgs/kde-python
Symbolic link
1
srcpkgs/kde-python
Symbolic link
|
|
@ -0,0 +1 @@
|
|||
kde-workspace
|
||||
|
|
@ -1,13 +1,13 @@
|
|||
# Template file for 'kde-runtime'
|
||||
pkgname=kde-runtime
|
||||
version=4.11.1
|
||||
version=4.11.4
|
||||
revision=1
|
||||
short_desc="Plugins and applications necessary for running KDE applications"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
license="GPL, LGPL, FDL"
|
||||
homepage="http://www.kde.org"
|
||||
distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz"
|
||||
checksum=639c397946e2bebf84bd9e49d4724b0dcf3b1e418873753adeed09505d556173
|
||||
checksum=b28104cd16d2ecd06c52664523d912dee5a2f16e75c24ee0a4229a5e7204cd16
|
||||
|
||||
build_style=cmake
|
||||
configure_args="-DKDE4_BUILD_TESTS=OFF DWITH_QNtrack=OFF"
|
||||
|
|
@ -29,7 +29,7 @@ post_install() {
|
|||
|
||||
kde-runtime-devel_package() {
|
||||
short_desc+=" - development files"
|
||||
depends="${sourcepkg}-${version}_${revision}"
|
||||
depends="${sourcepkg}>=${version}_${revision}"
|
||||
pkg_install() {
|
||||
vmove usr/include
|
||||
vmove usr/share/apps/cmake
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'kde-wallpapers'
|
||||
pkgname=kde-wallpapers
|
||||
version=4.11.1
|
||||
version=4.11.4
|
||||
revision=1
|
||||
build_style=cmake
|
||||
hostmakedepends="cmake automoc4 pkg-config"
|
||||
|
|
@ -10,7 +10,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
|
|||
license="GPL, LGPL, FDL"
|
||||
homepage="http://www.kde.org"
|
||||
distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz"
|
||||
checksum=e1c629f5eaebd68b57725ae5b68ced8efd4554f363f8c4ac2b136708cb529046
|
||||
checksum=8c22c1c777d228dab571b7d09ef6b4d025de9e7ccfe4671c308902eeb17c2d57
|
||||
|
||||
kde-wallpapers_package() {
|
||||
noarch=yes
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
case "$ACTION" in
|
||||
post)
|
||||
genkdmconf --no-old --no-backup >/dev/null 2>&1
|
||||
;;
|
||||
esac
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
case "$ACTION" in
|
||||
post)
|
||||
pre)
|
||||
if [ -d usr/share/apps/kdm/faces ]; then
|
||||
rm -rf usr/share/apps/kdm/faces
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -1,55 +0,0 @@
|
|||
From: Weng Xuetian <wengxt@gmail.com>
|
||||
Date: Mon, 09 Sep 2013 15:43:06 +0000
|
||||
Subject: Delay KDE class initialization to main loop
|
||||
X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=2e5a2450762f8dedf9ffd77028ed06b3a39a807d
|
||||
---
|
||||
Delay KDE class initialization to main loop
|
||||
|
||||
Gui platform plugin is loaded during QApplication construction, but it
|
||||
relies on some KApplication/QApplication data to work correctly.
|
||||
|
||||
This patch delays the initialization to main loop, to ensure
|
||||
KApplication/QApplication is already constructed.
|
||||
|
||||
BUG: 324574
|
||||
FIXED-IN: 4.11.2
|
||||
REVIEW: 112602
|
||||
---
|
||||
|
||||
|
||||
--- qguiplatformplugin_kde/qguiplatformplugin_kde.cpp
|
||||
+++ qguiplatformplugin_kde/qguiplatformplugin_kde.cpp
|
||||
@@ -28,6 +28,7 @@
|
||||
#include <KDE/KFileDialog>
|
||||
#include <KDE/KColorDialog>
|
||||
#include <QtCore/QHash>
|
||||
+#include <QtCore/QTimer>
|
||||
#include <QtGui/QFileDialog>
|
||||
#include <QtGui/QColorDialog>
|
||||
#include <QtGui/QApplication>
|
||||
@@ -153,9 +154,7 @@
|
||||
public:
|
||||
KQGuiPlatformPlugin()
|
||||
{
|
||||
- connect(KIconLoader::global(), SIGNAL(iconLoaderSettingsChanged()), this, SLOT(updateToolbarIcons()));
|
||||
- connect(KGlobalSettings::self(), SIGNAL(toolbarAppearanceChanged(int)), this, SLOT(updateToolbarStyle()));
|
||||
- connect(KGlobalSettings::self(), SIGNAL(kdisplayStyleChanged()), this, SLOT(updateWidgetStyle()));
|
||||
+ QMetaObject::invokeMethod(this, "init", Qt::QueuedConnection);
|
||||
}
|
||||
|
||||
virtual QStringList keys() const { return QStringList() << QLatin1String("kde"); }
|
||||
@@ -340,6 +339,13 @@
|
||||
}
|
||||
|
||||
private slots:
|
||||
+ void init()
|
||||
+ {
|
||||
+ connect(KIconLoader::global(), SIGNAL(iconLoaderSettingsChanged()), this, SLOT(updateToolbarIcons()));
|
||||
+ connect(KGlobalSettings::self(), SIGNAL(toolbarAppearanceChanged(int)), this, SLOT(updateToolbarStyle()));
|
||||
+ connect(KGlobalSettings::self(), SIGNAL(kdisplayStyleChanged()), this, SLOT(updateWidgetStyle()));
|
||||
+ }
|
||||
+
|
||||
void updateToolbarStyle()
|
||||
{
|
||||
//from gtksymbol.cpp
|
||||
|
||||
20
srcpkgs/kde-workspace/patches/patch-kdm_kcm_main.cpp
Normal file
20
srcpkgs/kde-workspace/patches/patch-kdm_kcm_main.cpp
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
$NetBSD: patch-kdm_kcm_main.cpp,v 1.1 2012/03/19 19:44:03 markd Exp $
|
||||
|
||||
Allow $PKG_SYSCONFDIR/kdm/kdmrc to override the one under $PREFIX
|
||||
|
||||
--- kdm/kcm/main.cpp.orig 2010-05-27 17:23:09.000000000 +0000
|
||||
+++ kdm/kcm/main.cpp
|
||||
@@ -281,8 +281,12 @@ KConfig *KDModule::createTempConfig()
|
||||
pTempConfigFile->open();
|
||||
QString tempConfigName = pTempConfigFile->fileName();
|
||||
|
||||
+ QFile confFile (QString::fromLatin1( "@PKG_SYSCONFDIR@" "/kdm/kdmrc" ));
|
||||
+ if ( !confFile.exists() )
|
||||
+ confFile.setFileName (QString::fromLatin1( KDE_CONFDIR "/kdm/kdmrc" ));
|
||||
+
|
||||
KConfig *pSystemKDMConfig = new KConfig(
|
||||
- QString::fromLatin1(KDE_CONFDIR "/kdm/kdmrc"), KConfig::SimpleConfig);
|
||||
+ confFile.fileName(), KConfig::SimpleConfig);
|
||||
|
||||
KConfig *pTempConfig = pSystemKDMConfig->copyTo(tempConfigName);
|
||||
pTempConfig->sync();
|
||||
|
|
@ -1,16 +1,18 @@
|
|||
# Template file for 'kde-workspace'
|
||||
pkgname=kde-workspace
|
||||
version=4.11.1
|
||||
revision=3
|
||||
version=4.11.4
|
||||
revision=1
|
||||
short_desc="Provides the interface and basic tools for the KDE workspace"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
license="GPL, LGPL, FDL"
|
||||
homepage="http://www.kde.org"
|
||||
distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz"
|
||||
checksum=78a157b09412de8067998268b0543f90c8120c3968a197d1ddd183eae6b5ff6e
|
||||
checksum=13420aeac5a6e0143f497fe988e6396f62d12862ae33ea1e1139d8137c07f16f
|
||||
|
||||
build_style=cmake
|
||||
configure_args="-DKDE4_BUILD_TESTS=OFF -DWITH_Xmms=OFF -DWITH_libgps=OFF -DWITH_CkConnector=OFF"
|
||||
configure_args="-DKDE4_BUILD_TESTS=OFF -DSYSCONF_INSTALL_DIR=/etc
|
||||
-DWITH_Xmms=OFF -DWITH_libgps=OFF -DWITH_CkConnector=OFF
|
||||
-DFREETYPE_INCLUDE_DIRS=/usr/include/freetype2"
|
||||
|
||||
# XXX qalculate, prison.
|
||||
hostmakedepends="cmake automoc4 pkg-config"
|
||||
|
|
@ -20,10 +22,14 @@ makedepends="openssl-devel qt-devel phonon-devel libdbusmenu-qt-devel strigi-dev
|
|||
libjpeg-turbo-devel libpng-devel libXcursor-devel libXi-devel libxkbfile-devel
|
||||
libXrandr-devel libXfixes-devel libSM-devel libXcomposite-devel libXdamage-devel
|
||||
libXtst-devel libXft-devel glib-devel fontconfig-devel nepomuk-core-devel>=${version}
|
||||
akonadi-devel kdepimlibs-devel>=${version} qjson-devel libsensors-devel
|
||||
akonadi-devel kdepimlibs-devel>=${version} qjson-devel libsensors-devel wayland-devel
|
||||
NetworkManager-devel pciutils-devel MesaLib-devel pam-devel libusb-compat-devel
|
||||
libraw1394-devel python-devel kde-wallpapers>=${version} kde-base-artwork>=${version}"
|
||||
|
||||
pre_configure() {
|
||||
sed -e "s,@PKG_SYSCONFDIR@,/etc,g" -i kdm/kcm/main.cpp
|
||||
}
|
||||
|
||||
post_install() {
|
||||
vmkdir etc/pam.d
|
||||
for f in kde kde-np kscreensaver; do
|
||||
|
|
@ -34,6 +40,9 @@ post_install() {
|
|||
vmkdir usr/share/xsessions
|
||||
ln -sf /usr/share/apps/kdm/sessions/kde-plasma{,-safe}.desktop \
|
||||
${DESTDIR}/usr/share/xsessions
|
||||
|
||||
install -Dm644 ${DESTDIR}/usr/share/config/kdm/kdmrc \
|
||||
${DESTDIR}/etc/kdm/kdmrc
|
||||
}
|
||||
|
||||
kde-workspace-devel_package() {
|
||||
|
|
@ -46,21 +55,31 @@ kde-workspace-devel_package() {
|
|||
}
|
||||
}
|
||||
|
||||
kde-python_package() {
|
||||
short_desc+=" - Python 2 bindings"
|
||||
pycompile_module="PyKDE4"
|
||||
pycompile_dirs="usr/share/apps/plasma_scriptengine_python"
|
||||
pkg_install() {
|
||||
vmove usr/lib/python2.7
|
||||
vmove usr/share/apps/plasma_scriptengine_python
|
||||
vmove "/usr/share/kde4/services/plasma-scriptengine*"
|
||||
}
|
||||
}
|
||||
|
||||
kde-workspace_package() {
|
||||
depends="python kde-wallpapers>=${version} kde-base-artwork>=${version}"
|
||||
depends="kde-wallpapers>=${version} kde-base-artwork>=${version}"
|
||||
conf_files="
|
||||
/etc/kdm/kdmrc
|
||||
/etc/ksysguarddrc
|
||||
/etc/pam.d/kde-np.pam
|
||||
/etc/pam.d/kde.pam
|
||||
/etc/pam.d/kscreensaver.pam
|
||||
/usr/share/config/kdm/kdmrc"
|
||||
/etc/pam.d/kscreensaver.pam"
|
||||
system_accounts="kdm"
|
||||
kdm_homedir="/var/lib/kdm"
|
||||
make_dirs="
|
||||
/etc/kde/env 0755 root root
|
||||
/etc/kde/shutdown 0755 root root
|
||||
/var/lib/kdm 0755 kdm kdm"
|
||||
pycompile_module="PyKDE4"
|
||||
pkg_install() {
|
||||
vmove all
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,22 +1,21 @@
|
|||
# Template file for 'kde'
|
||||
pkgname=kde
|
||||
version=4.11.1
|
||||
version=4.11.4
|
||||
revision=1
|
||||
build_style=meta
|
||||
makedepends="
|
||||
oxygen-icons>=${version}
|
||||
kdeartwork>=${version}
|
||||
kde-wallpapers>=${version}
|
||||
kde-baseapps>=${version}
|
||||
kde-runtime>=${version}
|
||||
kde-workspace>=${version}
|
||||
kde-wallpapers>=${version}
|
||||
kdeartwork>=${version}
|
||||
kdepim>=${version}
|
||||
kdepim-runtime>=${version}
|
||||
kdeplasma-addons>=${version}
|
||||
kwallet>=${version}
|
||||
kuser>=${version}
|
||||
kmix>=${version}
|
||||
konsole>=${version}
|
||||
oxygen-icons>=${version}
|
||||
phonon-backend-gstreamer
|
||||
udisks2
|
||||
polkit-kde"
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
# Template file for 'kdeartwork'
|
||||
pkgname=kdeartwork
|
||||
version=4.11.1
|
||||
version=4.11.4
|
||||
revision=1
|
||||
short_desc="KDE artwork"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
license="GPL, LGPL, FDL"
|
||||
homepage="http://www.kde.org"
|
||||
distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz"
|
||||
checksum=eab190a74c12ff5a6e50f2e171bfa8c5ed54d368a2b8ae89f0bb992806e359df
|
||||
checksum=dfe6f3d7e4be10978f97ceda4575cf3bcd180f5fa0a27fa33399fbfd4dbef166
|
||||
|
||||
build_style=cmake
|
||||
configure_args="-DKDE4_BUILD_TESTS=OFF"
|
||||
|
|
|
|||
22
srcpkgs/kdelibs/patches/kde-applications-menu.patch
Normal file
22
srcpkgs/kdelibs/patches/kde-applications-menu.patch
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
--- kded/CMakeLists.txt 2009-10-02 14:55:17.000000000 +0000
|
||||
+++ kded/CMakeLists.txt 2010-01-31 22:16:13.946933892 +0000
|
||||
@@ -69,7 +69,7 @@
|
||||
if (WIN32)
|
||||
install( FILES applications.menu DESTINATION ${SHARE_INSTALL_PREFIX}/xdg/menus )
|
||||
else (WIN32)
|
||||
-install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus )
|
||||
+install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde-applications.menu )
|
||||
endif (WIN32)
|
||||
install( FILES kdedmodule.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
|
||||
install( FILES kded.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
|
||||
--- kded/kbuildsycoca.cpp 2009-12-04 23:10:18.000000000 +0000
|
||||
+++ kded/kbuildsycoca.cpp 2010-01-31 22:16:13.962766572 +0000
|
||||
@@ -302,7 +302,7 @@
|
||||
if (!m_trackId.isEmpty())
|
||||
g_vfolder->setTrackId(m_trackId);
|
||||
|
||||
- VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
|
||||
+ VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true);
|
||||
|
||||
KServiceGroup::Ptr entry = g_bsgf->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false);
|
||||
entry->setLayoutInfo(kdeMenu->layoutList);
|
||||
|
|
@ -1,13 +1,13 @@
|
|||
# Template file for 'kdelibs'
|
||||
pkgname=kdelibs
|
||||
version=4.11.1
|
||||
version=4.11.4
|
||||
revision=1
|
||||
short_desc="KDE core libraries"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
license="GPL, LGPL, FDL"
|
||||
homepage="http://www.kde.org"
|
||||
distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz"
|
||||
checksum=8ebf816732a4366d67611a63405135650acd9e5bf0f7594e7ffa9a14e92dfc68
|
||||
checksum=dd52139eff1e635c0a9daa0ac846c72f5c62e0e68fcf986df6da1da04a062ded
|
||||
|
||||
build_style=cmake
|
||||
configure_args="-DKDE4_BUILD_TESTS=OFF -DKDE_DISTRIBUTION_TEXT=Void
|
||||
|
|
@ -31,7 +31,7 @@ post_install() {
|
|||
}
|
||||
|
||||
kdelibs-devel_package() {
|
||||
depends="${sourcepkg}-${version}_${revision}"
|
||||
depends="${sourcepkg}>=${version}_${revision}"
|
||||
pkg_install() {
|
||||
vmove usr/include
|
||||
vmove usr/share/apps/cmake
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
# Template file for 'kdepim-runtime'
|
||||
pkgname=kdepim-runtime
|
||||
version=4.11.1
|
||||
version=4.11.4
|
||||
revision=1
|
||||
short_desc="KDE PIM runtime applications/libraries"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
license="GPL, LGPL, FDL"
|
||||
homepage="https://projects.kde.org/projects/kde/kdepimlibs"
|
||||
distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz"
|
||||
checksum=00b7362061dd1019ab0927ab6ab197331f9d72593146d88c5b58aff7ed924e82
|
||||
checksum=190dee8676325465c5837ad712f348e37b7cb41262ff70a6b6dd90cbba80b22f
|
||||
|
||||
build_style=cmake
|
||||
configure_args="-DKDE4_BUILD_TESTS=OFF"
|
||||
configure_args="-DKDE4_BUILD_TESTS=OFF -DSYSCONF_INSTALL_DIR=/etc"
|
||||
|
||||
# XXX KolabLibraries, Kolabxml
|
||||
hostmakedepends="cmake automoc4 pkg-config"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'kdepim'
|
||||
pkgname=kdepim
|
||||
version=4.11.1
|
||||
version=4.11.4
|
||||
revision=1
|
||||
build_style=cmake
|
||||
configure_args="-DKDE4_BUILD_TESTS=OFF"
|
||||
|
|
@ -9,7 +9,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
|
|||
license="GPL, LGPL, FDL"
|
||||
homepage="https://projects.kde.org/projects/kde/kdepimlibs"
|
||||
distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz"
|
||||
checksum=292498349cb48ff366f2f8e0b61e7fb655bbeb0df8c14f0b398067cb712c627d
|
||||
checksum=64250635d9e63b25747919634be976c1666e78154d3ad26d5da65ee0be2f63e6
|
||||
|
||||
# XXX dblatex, prison
|
||||
hostmakedepends="cmake automoc4 pkg-config"
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
# Template file for 'kdepimlibs'
|
||||
pkgname=kdepimlibs
|
||||
version=4.11.1
|
||||
version=4.11.4
|
||||
revision=1
|
||||
short_desc="KDE PIM Libraries"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
license="GPL, LGPL, FDL"
|
||||
homepage="https://projects.kde.org/projects/kde/kdepimlibs"
|
||||
distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz"
|
||||
checksum=0618dc3003a53b7a0c5088e7406ef03f1a0ea35d7896b99c19774bad2bd455ea
|
||||
checksum=3b6ad270ce235dc49ed0935b13599aff66beec6284d08852504ae78680a785d1
|
||||
|
||||
build_style=cmake
|
||||
configure_args="-DKDE4_BUILD_TESTS=OFF"
|
||||
|
|
@ -19,7 +19,7 @@ makedepends="boost-devel nepomuk-core-devel gpgme-devel qjson-devel libical-deve
|
|||
|
||||
kdepimlibs-devel_package() {
|
||||
short_desc+=" - development files"
|
||||
depends="${sourcepkg}-${version}_${revision}"
|
||||
depends="${sourcepkg}>=${version}_${revision}"
|
||||
pkg_install() {
|
||||
vmove usr/include
|
||||
vmove usr/lib/cmake
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
# Template file for 'kdeplasma-addons'
|
||||
pkgname=kdeplasma-addons
|
||||
version=4.11.1
|
||||
version=4.11.4
|
||||
revision=1
|
||||
short_desc="KDE Plasma Add-ons"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
license="GPL, LGPL, FDL"
|
||||
homepage="http://www.kde.org"
|
||||
distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz"
|
||||
checksum=77ee480e7118fc46e9d175a008c2ab86c4ca316abfe43d9499813541590a4451
|
||||
checksum=cca58326f4cc93255366f0aa2b75c1c13b04001d82bfa797ba921e5c4a51befd
|
||||
|
||||
build_style=cmake
|
||||
configure_args="-DKDE4_BUILD_TESTS=OFF"
|
||||
configure_args="-DKDE4_BUILD_TESTS=OFF -DSYSCONF_INSTALL_DIR=/etc"
|
||||
|
||||
# XXX scim, marble.
|
||||
hostmakedepends="cmake automoc4 pkg-config"
|
||||
|
|
@ -22,7 +22,7 @@ makedepends="openssl-devel qt-devel phonon-devel strigi-devel qoauth-devel
|
|||
|
||||
kdeplasma-addons-devel_package() {
|
||||
short_desc+=" - development files"
|
||||
depends="${sourcepkg}-${version}_${revision}"
|
||||
depends="${sourcepkg}>=${version}_${revision}"
|
||||
pkg_install() {
|
||||
vmove usr/include
|
||||
vmove usr/share/apps/cmake
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
# Template file for 'kmix'
|
||||
pkgname=kmix
|
||||
version=4.11.1
|
||||
version=4.11.4
|
||||
revision=1
|
||||
short_desc="KDE's mixer application"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
license="GPL, LGPL, FDL"
|
||||
homepage="http://www.kde.org"
|
||||
distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz"
|
||||
checksum=75a762204e764716a8ee5ae04437bacd972a8c72c15350eaf79765ed8ecd912e
|
||||
checksum=a09b1ec50cb353c82fba3e5a4c46dafdb43594c69915cbabb7d1c3e0f6c31173
|
||||
|
||||
build_style=cmake
|
||||
configure_args="-DKDE4_BUILD_TESTS=OFF"
|
||||
configure_args="-DKDE4_BUILD_TESTS=OFF -DSYSCONF_INSTALL_DIR=/etc"
|
||||
|
||||
hostmakedepends="cmake automoc4 pkg-config"
|
||||
makedepends="glib-devel openssl-devel qt-devel phonon-devel strigi-devel
|
||||
|
|
@ -18,7 +18,6 @@ makedepends="glib-devel openssl-devel qt-devel phonon-devel strigi-devel
|
|||
alsa-lib-devel pulseaudio-devel libcanberra-devel"
|
||||
|
||||
kmix_package() {
|
||||
depends="pulseaudio"
|
||||
pkg_install() {
|
||||
vmove all
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,22 +1,16 @@
|
|||
# Template file for 'konsole'
|
||||
pkgname=konsole
|
||||
version=4.11.1
|
||||
version=4.11.4
|
||||
revision=1
|
||||
short_desc="KDE's Terminal Emulator"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
license="GPL, LGPL, FDL"
|
||||
homepage="http://www.kde.org"
|
||||
distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz"
|
||||
checksum=a74f41fc3dd23fc5e9b8484928ad2bd662498dd1320e05d82269c545c515e3f2
|
||||
long_desc="
|
||||
As well as being a standalone program, it is also used by other KDE programs
|
||||
such as the Kate editor and KDevelop development environment to provide easy
|
||||
access to a terminal window. Konsole's features and usage are explained and
|
||||
illustrated in the Konsole handbook, which can be accessed by browsing to
|
||||
"help:/konsole" in Konqueror"
|
||||
checksum=aa4e67eb15ed5daefe2fcbe18ffef0a3988e8cc166ccfc2060cec406a343c696
|
||||
|
||||
build_style=cmake
|
||||
configure_args="-DKDE4_BUILD_TESTS=OFF"
|
||||
configure_args="-DKDE4_BUILD_TESTS=OFF -DSYSCONF_INSTALL_DIR=/etc"
|
||||
|
||||
hostmakedepends="cmake automoc4 pkg-config"
|
||||
makedepends="glib-devel openssl-devel qt-devel phonon-devel strigi-devel
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
# Template file for 'kuser'
|
||||
pkgname=kuser
|
||||
version=4.11.1
|
||||
version=4.11.4
|
||||
revision=1
|
||||
short_desc="KDE User Manager"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
license="GPL, LGPL, FDL"
|
||||
homepage="http://www.kde.org"
|
||||
distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz"
|
||||
checksum=bbdaeb1671e00d7bc1f0e3c1b9c66e6837f03ea4a34bfe1ba21f09dec118d811
|
||||
checksum=4d9a7cfe54350d494f38345cec748f44b793160af0456670a8babe6e09fbba91
|
||||
|
||||
build_style=cmake
|
||||
configure_args="-DKDE4_BUILD_TESTS=OFF"
|
||||
configure_args="-DKDE4_BUILD_TESTS=OFF -DSYSCONF_INSTALL_DIR=/etc"
|
||||
|
||||
hostmakedepends="cmake automoc4 pkg-config"
|
||||
makedepends="glib-devel openssl-devel qt-devel phonon-devel strigi-devel
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
# Template file for 'kwallet'
|
||||
pkgname=kwallet
|
||||
version=4.11.1
|
||||
version=4.11.4
|
||||
revision=1
|
||||
short_desc="KDE Wallet Management Tools"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
license="GPL, LGPL, FDL"
|
||||
homepage="http://www.kde.org"
|
||||
distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz"
|
||||
checksum=1995a319973724092ef4c0288b2247eba6f34d2e23417dbc31e09088b6f71edf
|
||||
checksum=955bb22aefef7725bf5bee7e70cd5991333e8f9af60f0dee888356b5f01f5ce8
|
||||
|
||||
build_style=cmake
|
||||
configure_args="-DKDE4_BUILD_TESTS=OFF"
|
||||
configure_args="-DKDE4_BUILD_TESTS=OFF -DSYSCONF_INSTALL_DIR=/etc"
|
||||
|
||||
hostmakedepends="cmake automoc4 pkg-config"
|
||||
makedepends="glib-devel openssl-devel qt-devel phonon-devel strigi-devel
|
||||
|
|
|
|||
|
|
@ -1,21 +1,21 @@
|
|||
# Template file for 'lftp'
|
||||
pkgname=lftp
|
||||
version=4.4.11
|
||||
version=4.4.14
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--with-modules --disable-rpath --without-included-regex
|
||||
--with-openssl i_cv_posix_fallocate_works=yes"
|
||||
hostmakedepends="libtool pkg-config"
|
||||
hostmakedepends="automake libtool pkg-config"
|
||||
makedepends="ncurses-devel readline-devel openssl-devel expat-devel"
|
||||
short_desc="Sophisticated FTP/HTTP client"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
homepage="http://lftp.yar.ru/"
|
||||
license="GPL-3"
|
||||
distfiles="http://lftp.yar.ru/ftp/lftp-${version}.tar.xz"
|
||||
checksum=3f3e4109e97281ebc517958addff018ca5fc9fdf85f1dc162864f6017dd991a2
|
||||
checksum=61ceaefbd476061e728e2b1294c27866402237d1d6539ed9ca98769dba3c9189
|
||||
|
||||
pre_configure() {
|
||||
libtoolize -f
|
||||
autoreconf -fi
|
||||
}
|
||||
|
||||
lftp_package() {
|
||||
|
|
|
|||
1
srcpkgs/libcinnamon-control-center
Symbolic link
1
srcpkgs/libcinnamon-control-center
Symbolic link
|
|
@ -0,0 +1 @@
|
|||
cinnamon-control-center
|
||||
|
|
@ -1,15 +1,15 @@
|
|||
# Template file for 'libestr'
|
||||
pkgname=libestr
|
||||
version=0.1.5
|
||||
version=0.1.9
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--disable-static ac_cv_func_malloc_0_nonnull=yes"
|
||||
configure_args="ac_cv_func_malloc_0_nonnull=yes"
|
||||
short_desc="C library for string processing"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
license="LGPL-2.1"
|
||||
homepage="http://libestr.adiscon.com"
|
||||
distfiles="$homepage/files/download/$pkgname-$version.tar.gz"
|
||||
checksum=ff9734663c8e7384835e12c65313efe14b1d7ec310f48c977d35f66b1050659e
|
||||
checksum=822c6e2d01eaca1e72201f403a2ca01f3e86410b880e508e5204e3c2694d751a
|
||||
|
||||
libestr-devel_package() {
|
||||
depends="libestr>=${version}"
|
||||
|
|
@ -17,12 +17,13 @@ libestr-devel_package() {
|
|||
pkg_install() {
|
||||
vmove usr/include
|
||||
vmove usr/lib/pkgconfig
|
||||
vmove "usr/lib/*.a"
|
||||
vmove "usr/lib/*.so"
|
||||
}
|
||||
}
|
||||
|
||||
libestr_package() {
|
||||
pkg_install() {
|
||||
vmove usr
|
||||
vmove all
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'libisofs'
|
||||
pkgname=libisofs
|
||||
version=1.2.6
|
||||
revision=2
|
||||
version=1.3.4
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--disable-static --enable-libacl --enable-xattr"
|
||||
makedepends="acl-devel zlib-devel"
|
||||
|
|
@ -10,19 +10,20 @@ maintainer="Juan RP <xtraeme@gmail.com>"
|
|||
homepage="http://www.libburnia-project.org"
|
||||
license="GPL-2"
|
||||
distfiles="http://files.libburnia-project.org/releases/$pkgname-$version.tar.gz"
|
||||
checksum=c89da6821d5cac049657a27bbbc19d69b475ca51bfd595804617ee6ee2e977b7
|
||||
checksum=fd1b23cc855b2c62384106dffa5ae9e779ed9bce1702b9687b2b64bb623c19f4
|
||||
|
||||
libisofs-devel_package() {
|
||||
depends="zlib-devel acl-devel attr-devel libisofs>=$version"
|
||||
short_desc="${short_desc} -- development files"
|
||||
depends="zlib-devel acl-devel libisofs>=${version}_${revision}"
|
||||
short_desc+=" - development files"
|
||||
pkg_install() {
|
||||
vmove usr/include
|
||||
vmove usr/lib/pkgconfig
|
||||
vmove "usr/lib/*.so"
|
||||
}
|
||||
}
|
||||
|
||||
libisofs_package() {
|
||||
pkg_install() {
|
||||
vmove usr
|
||||
vmove all
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'libkexiv2'
|
||||
pkgname=libkexiv2
|
||||
version=4.11.1
|
||||
version=4.11.4
|
||||
revision=1
|
||||
build_style=cmake
|
||||
hostmakedepends="cmake automoc4 pkg-config"
|
||||
|
|
@ -10,11 +10,11 @@ maintainer="Juan RP <xtraeme@gmail.com>"
|
|||
license="GPL, LGPL, FDL"
|
||||
homepage="https://projects.kde.org/projects/kde/kdegraphics/libs/libkexiv2"
|
||||
distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz"
|
||||
checksum=2ebe38cc6201a336d55d602bddb5362c78ab447b6ac2bf32fbf526383c23a983
|
||||
checksum=45aa9b3a38eec9818cfbfaf6ff40314716f82cb5ba499e74f5de11638be81911
|
||||
|
||||
libkexiv2-devel_package() {
|
||||
short_desc+=" - development files"
|
||||
depends="${sourcepkg}-${version}_${revision}"
|
||||
depends="${sourcepkg}>=${version}_${revision}"
|
||||
pkg_install() {
|
||||
vmove usr/include
|
||||
vmove usr/lib/pkgconfig
|
||||
|
|
|
|||
1
srcpkgs/libnemo
Symbolic link
1
srcpkgs/libnemo
Symbolic link
|
|
@ -0,0 +1 @@
|
|||
nemo
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'libtaginfo'
|
||||
pkgname=libtaginfo
|
||||
version=0.1.6
|
||||
version=0.2.0
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
hostmakedepends="pkg-config"
|
||||
|
|
@ -10,17 +10,10 @@ maintainer="Juan RP <xtraeme@gmail.com>"
|
|||
license="GPL-2"
|
||||
homepage="https://bitbucket.org/shuerhaaken/libtaginfo"
|
||||
distfiles="https://bitbucket.org/shuerhaaken/libtaginfo/downloads/${pkgname}-${version}.tar.gz"
|
||||
checksum=7473b7dd52471fa1c40766b71ecce7cd12e9641491ec59c4eb9b977b5d796345
|
||||
long_desc="
|
||||
TagInfo is a convenience wrapper for taglib with C and vala bindings.
|
||||
|
||||
Features are reading/writing fields like: Artist, Album, Title, Genre,
|
||||
AlbumArtist, Comments, Disk number, Compilation flag, User labels, Embedded
|
||||
Images, Lyrics, Audio properties (length, bitrate, samplerate, channels ...),
|
||||
and much more."
|
||||
checksum=7a2ef1c74fa4bd054e589582ff8ad6ff0519490777df32304580911d332d8313
|
||||
|
||||
libtaginfo-devel_package() {
|
||||
depends="taglib-devel ${sourcepkg}>=${version}"
|
||||
depends="taglib-devel ${sourcepkg}>=${version}_${revision}"
|
||||
short_desc+=" - development files"
|
||||
pkg_install() {
|
||||
vmove usr/include
|
||||
|
|
@ -33,6 +26,6 @@ libtaginfo-devel_package() {
|
|||
|
||||
libtaginfo_package() {
|
||||
pkg_install() {
|
||||
vmove usr
|
||||
vmove all
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'linux3.10'
|
||||
#
|
||||
pkgname=linux3.10
|
||||
version=3.10.23
|
||||
version=3.10.24
|
||||
revision=1
|
||||
wrksrc="linux-${version}"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
|
|
@ -9,7 +9,7 @@ homepage="http://www.kernel.org"
|
|||
license="GPL-2"
|
||||
short_desc="The Linux kernel and modules (3.10 series)"
|
||||
distfiles="http://www.kernel.org/pub/linux//kernel/v3.x/linux-${version}.tar.xz"
|
||||
checksum=9756377bf654d52135273c1b39a8afd8a99ee5bddb7d977c34827e49bcb701c3
|
||||
checksum=0960121b9bea0bf2eab1da0f50fa88016e2eb2302fd5e929d695d7555d6dd5b7
|
||||
|
||||
only_for_archs="i686 x86_64"
|
||||
makedepends="bc perl kmod>=11_2 openssl which elfutils"
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
# Template file for 'linux3.12'
|
||||
#
|
||||
pkgname=linux3.12
|
||||
version=3.12.4
|
||||
revision=2
|
||||
version=3.12.5
|
||||
revision=1
|
||||
wrksrc="linux-${version}"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
homepage="http://www.kernel.org"
|
||||
license="GPL-2"
|
||||
short_desc="The Linux kernel and modules (3.12 series)"
|
||||
distfiles="http://www.kernel.org/pub/linux//kernel/v3.x/linux-${version}.tar.xz"
|
||||
checksum=c56317810e5716dd2be7ad947a6bd174460f7cf9afb33b700a052aa91f73f9bb
|
||||
checksum=48181474f3943f77c1e62bed676b09a9fed64364d5847ce14a45b8d947112719
|
||||
|
||||
only_for_archs="i686 x86_64"
|
||||
makedepends="bc perl kmod>=11_2 openssl which elfutils"
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
linux3.8
|
||||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -1,220 +0,0 @@
|
|||
# Template file for 'linux3.8'
|
||||
#
|
||||
pkgname=linux3.8
|
||||
version=3.8.13
|
||||
revision=3
|
||||
wrksrc="linux-${version}"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
homepage="http://www.kernel.org"
|
||||
license="GPL-2"
|
||||
short_desc="The Linux kernel and modules (3.8 series)"
|
||||
distfiles="http://www.kernel.org/pub/linux//kernel/v3.x/linux-${version}.tar.xz"
|
||||
checksum=7cd135cc1791680553cc40bf23ce11ab24b84a3ece33d810950e089090d4f65f
|
||||
|
||||
only_for_archs="i686 x86_64"
|
||||
makedepends="perl kmod>=11_2 openssl which elfutils"
|
||||
_kernver="${version}_${revision}"
|
||||
|
||||
do_configure() {
|
||||
# If there's a file called <arch>-dotconfig, use it to
|
||||
# configure the kernel; otherwise use arch defaults and all stuff
|
||||
# as modules (defconfig+allmodconfig).
|
||||
local arch
|
||||
|
||||
if [ "$XBPS_TARGET_MACHINE" != "x86_64" ]; then
|
||||
arch=i386
|
||||
else
|
||||
arch=x86_64
|
||||
fi
|
||||
|
||||
if [ -f ${FILESDIR}/${arch}-dotconfig-custom ]; then
|
||||
msg_normal "Detected a custom .config file for your arch, using it.\n"
|
||||
cp -f ${FILESDIR}/${arch}-dotconfig-custom .config
|
||||
make ${makejobs} oldconfig
|
||||
elif [ -f ${FILESDIR}/${arch}-dotconfig ]; then
|
||||
msg_normal "Detected a .config file for your arch, using it.\n"
|
||||
cp -f ${FILESDIR}/${arch}-dotconfig .config
|
||||
make ${makejobs} oldconfig
|
||||
else
|
||||
msg_normal "Defaulting to 'defconfig and allmodconfig'.\n"
|
||||
make ${makejobs} defconfig && make ${makejobs} allmodconfig
|
||||
fi
|
||||
# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
|
||||
sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
|
||||
}
|
||||
|
||||
do_build() {
|
||||
make ${makejobs} prepare
|
||||
make ${makejobs} bzImage modules
|
||||
}
|
||||
|
||||
do_install() {
|
||||
local arch hdrdest
|
||||
|
||||
if [ "$XBPS_TARGET_MACHINE" != "x86_64" ]; then
|
||||
arch=i386
|
||||
else
|
||||
arch=x86_64
|
||||
fi
|
||||
|
||||
# Run depmod after compressing modules.
|
||||
sed -i '2iexit 0' scripts/depmod.sh
|
||||
|
||||
# Install kernel, firmware and modules
|
||||
make INSTALL_MOD_PATH=${DESTDIR} modules_install
|
||||
|
||||
hdrdest=${DESTDIR}/usr/src/kernel-headers-${_kernver}
|
||||
|
||||
install -Dm644 .config ${DESTDIR}/boot/config-${_kernver}
|
||||
install -Dm644 arch/x86/boot/bzImage ${DESTDIR}/boot/vmlinuz-${_kernver}
|
||||
install -Dm644 System.map ${DESTDIR}/boot/System.map-${_kernver}
|
||||
|
||||
# Switch to /usr.
|
||||
vmkdir usr
|
||||
mv ${DESTDIR}/lib ${DESTDIR}/usr
|
||||
|
||||
cd ${DESTDIR}/usr/lib/modules/${_kernver}
|
||||
rm -f source build
|
||||
ln -sf ../../../src/kernel-headers-${_kernver} build
|
||||
|
||||
cd ${wrksrc}
|
||||
# Install required headers to build external modules
|
||||
install -Dm644 Makefile ${hdrdest}/Makefile
|
||||
install -Dm644 kernel/Makefile ${hdrdest}/kernel/Makefile
|
||||
install -Dm644 .config ${hdrdest}/.config
|
||||
mkdir -p ${hdrdest}/include
|
||||
# Remove firmware stuff provided by the "linux-firmware" pkg.
|
||||
rm -rf ${DESTDIR}/usr/lib/firmware
|
||||
|
||||
for i in acpi asm-generic config crypto drm generated linux math-emu \
|
||||
media net pcmcia scsi sound trace uapi video xen; do
|
||||
if [ -d include/$i ]; then
|
||||
cp -a include/$i ${hdrdest}/include
|
||||
fi
|
||||
done
|
||||
|
||||
cd ${wrksrc}
|
||||
mkdir -p ${hdrdest}/arch/x86
|
||||
cp -a arch/x86/include ${hdrdest}/arch/x86
|
||||
|
||||
# Copy files necessary for later builds, like nvidia and vmware
|
||||
cp Module.symvers ${hdrdest}
|
||||
cp -a scripts ${hdrdest}
|
||||
|
||||
mkdir -p ${hdrdest}/arch/x86/kernel
|
||||
cp arch/x86/Makefile ${hdrdest}/arch/x86
|
||||
if [ "$arch" = "i386" ]; then
|
||||
cp arch/x86/Makefile_32.cpu ${hdrdest}/arch/x86
|
||||
fi
|
||||
cp arch/x86/kernel/asm-offsets.s ${hdrdest}/arch/x86/kernel
|
||||
|
||||
# add headers for lirc package
|
||||
# pci
|
||||
for i in bt8xx cx88 saa7134; do
|
||||
mkdir -p ${hdrdest}/drivers/media/pci/${i}
|
||||
cp -a drivers/media/pci/${i}/*.h ${hdrdest}/drivers/media/pci/${i}
|
||||
done
|
||||
# usb
|
||||
for i in cpia2 em28xx pwc sn9c102; do
|
||||
mkdir -p ${hdrdest}/drivers/media/usb/${i}
|
||||
cp -a drivers/media/usb/${i}/*.h ${hdrdest}/drivers/media/usb/${i}
|
||||
done
|
||||
# i2c
|
||||
mkdir -p ${hdrdest}/drivers/media/i2c
|
||||
cp drivers/media/i2c/*.h ${hdrdest}/drivers/media/i2c
|
||||
for i in cx25840; do
|
||||
mkdir -p ${hdrdest}/drivers/media/i2c/${i}
|
||||
cp -a drivers/media/i2c/${i}/*.h ${hdrdest}/drivers/media/i2c/${i}
|
||||
done
|
||||
|
||||
# Add docbook makefile
|
||||
install -Dm644 Documentation/DocBook/Makefile \
|
||||
${hdrdest}/Documentation/DocBook/Makefile
|
||||
|
||||
# Add md headers
|
||||
mkdir -p ${hdrdest}/drivers/md
|
||||
cp drivers/md/*.h ${hdrdest}/drivers/md
|
||||
|
||||
# Add inotify.h
|
||||
mkdir -p ${hdrdest}/include/linux
|
||||
cp include/linux/inotify.h ${hdrdest}/include/linux
|
||||
|
||||
# Add wireless headers
|
||||
mkdir -p ${hdrdest}/net/mac80211/
|
||||
cp net/mac80211/*.h ${hdrdest}/net/mac80211
|
||||
|
||||
# add dvb headers for external modules
|
||||
mkdir -p ${hdrdest}/drivers/media/dvb-core
|
||||
cp drivers/media/dvb-core/*.h ${hdrdest}/drivers/media/dvb-core/
|
||||
mkdir -p ${hdrdest}/include/config/dvb/
|
||||
cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
|
||||
|
||||
# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
|
||||
mkdir -p ${hdrdest}/drivers/media/dvb-frontends
|
||||
cp drivers/media/dvb-frontends/lgdt330x.h \
|
||||
${hdrdest}/drivers/media/dvb-frontends/
|
||||
cp drivers/media/i2c/msp3400-driver.h ${hdrdest}/drivers/media/i2c/
|
||||
|
||||
# add dvb headers
|
||||
mkdir -p ${hdrdest}/drivers/media/usb/dvb-usb
|
||||
cp drivers/media/usb/dvb-usb/*.h ${hdrdest}/drivers/media/usb/dvb-usb/
|
||||
mkdir -p ${hdrdest}/drivers/media/dvb-frontends
|
||||
cp drivers/media/dvb-frontends/*.h ${hdrdest}/drivers/media/dvb-frontends/
|
||||
mkdir -p ${hdrdest}/drivers/media/tuners
|
||||
cp drivers/media/tuners/*.h ${hdrdest}/drivers/media/tuners/
|
||||
|
||||
# Add xfs and shmem for aufs building
|
||||
mkdir -p ${hdrdest}/fs/xfs
|
||||
mkdir -p ${hdrdest}/mm
|
||||
cp fs/xfs/xfs_sb.h ${hdrdest}/fs/xfs/xfs_sb.h
|
||||
|
||||
# Copy in Kconfig files
|
||||
for i in $(find . -name "Kconfig*"); do
|
||||
mkdir -p ${hdrdest}/$(echo $i | sed 's|/Kconfig.*||')
|
||||
cp $i ${hdrdest}/$i
|
||||
done
|
||||
|
||||
# Remove unneeded architectures
|
||||
for arch in alpha arm* avr32 blackfin cris frv h8300 \
|
||||
ia64 m* p* s* um v850 xtensa; do
|
||||
rm -rf ${hdrdest}/arch/${arch}
|
||||
done
|
||||
|
||||
# Compress all modules with xz to save a few MBs.
|
||||
msg_normal "$pkgver: compressing kernel modules with xz, please wait...\n"
|
||||
find ${DESTDIR} -name '*.ko' -exec xz -9 {} \;
|
||||
|
||||
# ... and run depmod again.
|
||||
depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
|
||||
}
|
||||
|
||||
linux3.8-headers_package() {
|
||||
preserve=yes
|
||||
nostrip=yes
|
||||
noverifyrdeps=yes
|
||||
short_desc+=" - source headers for 3rd party modules"
|
||||
pkg_install() {
|
||||
vmove usr/src
|
||||
vmove usr/lib/modules/${_kernver}/build
|
||||
}
|
||||
}
|
||||
|
||||
linux3.8_package() {
|
||||
nostrip=yes
|
||||
noverifyrdeps=yes
|
||||
preserve=yes
|
||||
triggers="kernel-hooks"
|
||||
depends="dracut linux-firmware kmod>=11_2"
|
||||
# These files could be modified when an external module is built.
|
||||
mutable_files="
|
||||
/usr/lib/modules/${_kernver}/modules.dep
|
||||
/usr/lib/modules/${_kernver}/modules.dep.bin
|
||||
/usr/lib/modules/${_kernver}/modules.symbols
|
||||
/usr/lib/modules/${_kernver}/modules.symbols.bin
|
||||
/usr/lib/modules/${_kernver}/modules.alias
|
||||
/usr/lib/modules/${_kernver}/modules.alias.bin
|
||||
/usr/lib/modules/${_kernver}/modules.devname"
|
||||
pkg_install() {
|
||||
vmove all
|
||||
}
|
||||
}
|
||||
|
|
@ -1 +0,0 @@
|
|||
linux3.9
|
||||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -1,53 +0,0 @@
|
|||
From b75c5a66f0cc21a340beb462c4f051ee6cd53cb9 Mon Sep 17 00:00:00 2001
|
||||
From: Imre Deak <imre.deak@intel.com>
|
||||
Date: Wed, 1 May 2013 21:18:46 +0300
|
||||
Subject: [PATCH] drm/i915: fix DP AUX errors due to false timeouts when using
|
||||
wait_event_timeout
|
||||
|
||||
Due to possible scheduling latencies wait_event_timeout doesn't
|
||||
guarantee a non-zero return value, even if the condition becomes true
|
||||
before the specified timeout expires. Thus we can incorrectly signal a
|
||||
timeout and abort a DP AUX transaction.
|
||||
|
||||
If wait_event_timeout returns 0, it's guaranteed that at least the
|
||||
specified timeout (minus one jiffies, see below) had passed, so we can
|
||||
fix this by checking the condition explicitly in this case.
|
||||
|
||||
Also the timeout that wait_event_timeout() is guaranteed to wait if the
|
||||
condition doesn't become true is one less jiffies than what is passed to
|
||||
it as a parameter. This is because the absolute expiration time in
|
||||
schedule_timeout() may be calculated at a moment close to the next
|
||||
scheduling tick, when jiffies is incremented. So make sure we pass always
|
||||
a jiffies value of 2 or greater. Here this makes a difference only for
|
||||
HZ=100.
|
||||
|
||||
This fixes DP AUX errors I saw during booting on an ILK.
|
||||
|
||||
This should ideally be fixed in wait_event_timeout(), but that can take
|
||||
a while. Until that's done use this fix as a band-aid.
|
||||
|
||||
Signed-off-by: Imre Deak <imre.deak@intel.com>
|
||||
---
|
||||
drivers/gpu/drm/i915/intel_dp.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
|
||||
index 8759fb1..7ce96c5 100644
|
||||
--- drivers/gpu/drm/i915/intel_dp.c
|
||||
+++ drivers/gpu/drm/i915/intel_dp.c
|
||||
@@ -303,10 +303,10 @@ intel_dp_aux_wait_done(struct intel_dp *intel_dp, bool has_aux_irq)
|
||||
#define C (((status = I915_READ_NOTRACE(ch_ctl)) & DP_AUX_CH_CTL_SEND_BUSY) == 0)
|
||||
if (has_aux_irq)
|
||||
done = wait_event_timeout(dev_priv->gmbus_wait_queue, C,
|
||||
- msecs_to_jiffies(10));
|
||||
+ msecs_to_jiffies(10) + 1);
|
||||
else
|
||||
done = wait_for_atomic(C, 10) == 0;
|
||||
- if (!done)
|
||||
+ if (!done && !(C))
|
||||
DRM_ERROR("dp aux hw did not signal timeout (has irq: %i)!\n",
|
||||
has_aux_irq);
|
||||
#undef C
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
|
@ -1,223 +0,0 @@
|
|||
# Template file for 'linux3.9'
|
||||
#
|
||||
pkgname=linux3.9
|
||||
version=3.9.11
|
||||
revision=2
|
||||
wrksrc="linux-${version}"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
homepage="http://www.kernel.org"
|
||||
license="GPL-2"
|
||||
short_desc="The Linux kernel and modules (3.9 series)"
|
||||
distfiles="http://www.kernel.org/pub/linux//kernel/v3.x/linux-${version}.tar.xz"
|
||||
checksum=d4b9e522925d9b1b3fd130c8b7690ef6af4faf118fc4c5e28dfcbb18de3cb234
|
||||
|
||||
only_for_archs="i686 x86_64"
|
||||
makedepends="bc perl kmod>=11_2 openssl which elfutils"
|
||||
_kernver="${version}_${revision}"
|
||||
|
||||
do_configure() {
|
||||
# If there's a file called <arch>-dotconfig, use it to
|
||||
# configure the kernel; otherwise use arch defaults and all stuff
|
||||
# as modules (defconfig+allmodconfig).
|
||||
local arch
|
||||
|
||||
if [ "$XBPS_TARGET_MACHINE" != "x86_64" ]; then
|
||||
arch=i386
|
||||
else
|
||||
arch=x86_64
|
||||
fi
|
||||
|
||||
if [ -f ${FILESDIR}/${arch}-dotconfig-custom ]; then
|
||||
msg_normal "Detected a custom .config file for your arch, using it.\n"
|
||||
cp -f ${FILESDIR}/${arch}-dotconfig-custom .config
|
||||
make ${makejobs} oldconfig
|
||||
elif [ -f ${FILESDIR}/${arch}-dotconfig ]; then
|
||||
msg_normal "Detected a .config file for your arch, using it.\n"
|
||||
cp -f ${FILESDIR}/${arch}-dotconfig .config
|
||||
make ${makejobs} oldconfig
|
||||
else
|
||||
msg_normal "Defaulting to 'defconfig and allmodconfig'.\n"
|
||||
make ${makejobs} defconfig
|
||||
make ${makejobs} allmodconfig
|
||||
fi
|
||||
# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
|
||||
sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
|
||||
}
|
||||
|
||||
do_build() {
|
||||
make ${makejobs} prepare
|
||||
make ${makejobs} bzImage modules
|
||||
}
|
||||
|
||||
do_install() {
|
||||
local arch hdrdest
|
||||
|
||||
if [ "$XBPS_TARGET_MACHINE" != "x86_64" ]; then
|
||||
arch=i386
|
||||
else
|
||||
arch=x86_64
|
||||
fi
|
||||
|
||||
# Run depmod after compressing modules.
|
||||
sed -i '2iexit 0' scripts/depmod.sh
|
||||
|
||||
# Install kernel, firmware and modules
|
||||
make INSTALL_MOD_PATH=${DESTDIR} modules_install
|
||||
|
||||
hdrdest=${DESTDIR}/usr/src/kernel-headers-${_kernver}
|
||||
|
||||
install -Dm644 .config ${DESTDIR}/boot/config-${_kernver}
|
||||
install -Dm644 arch/x86/boot/bzImage \
|
||||
${DESTDIR}/boot/vmlinuz-${_kernver}
|
||||
install -Dm644 System.map \
|
||||
${DESTDIR}/boot/System.map-${_kernver}
|
||||
|
||||
# Switch to /usr.
|
||||
vmkdir usr
|
||||
mv ${DESTDIR}/lib ${DESTDIR}/usr
|
||||
|
||||
cd ${DESTDIR}/usr/lib/modules/${_kernver}
|
||||
rm -f source build
|
||||
ln -sf ../../../src/kernel-headers-${_kernver} build
|
||||
|
||||
cd ${wrksrc}
|
||||
# Install required headers to build external modules
|
||||
install -Dm644 Makefile ${hdrdest}/Makefile
|
||||
install -Dm644 kernel/Makefile ${hdrdest}/kernel/Makefile
|
||||
install -Dm644 .config ${hdrdest}/.config
|
||||
mkdir -p ${hdrdest}/include
|
||||
# Remove firmware stuff provided by the "linux-firmware" pkg.
|
||||
rm -rf ${DESTDIR}/usr/lib/firmware
|
||||
|
||||
for i in acpi asm-generic config crypto drm generated linux math-emu \
|
||||
media net pcmcia scsi sound trace uapi video xen; do
|
||||
if [ -d include/$i ]; then
|
||||
cp -a include/$i ${hdrdest}/include
|
||||
fi
|
||||
done
|
||||
|
||||
cd ${wrksrc}
|
||||
mkdir -p ${hdrdest}/arch/x86
|
||||
cp -a arch/x86/include ${hdrdest}/arch/x86
|
||||
|
||||
# Copy files necessary for later builds, like nvidia and vmware
|
||||
cp Module.symvers ${hdrdest}
|
||||
cp -a scripts ${hdrdest}
|
||||
|
||||
mkdir -p ${hdrdest}/arch/x86/kernel
|
||||
cp arch/x86/Makefile ${hdrdest}/arch/x86
|
||||
if [ "$arch" = "i386" ]; then
|
||||
cp arch/x86/Makefile_32.cpu ${hdrdest}/arch/x86
|
||||
fi
|
||||
cp arch/x86/kernel/asm-offsets.s ${hdrdest}/arch/x86/kernel
|
||||
|
||||
# add headers for lirc package
|
||||
# pci
|
||||
for i in bt8xx cx88 saa7134; do
|
||||
mkdir -p ${hdrdest}/drivers/media/pci/${i}
|
||||
cp -a drivers/media/pci/${i}/*.h ${hdrdest}/drivers/media/pci/${i}
|
||||
done
|
||||
# usb
|
||||
for i in cpia2 em28xx pwc sn9c102; do
|
||||
mkdir -p ${hdrdest}/drivers/media/usb/${i}
|
||||
cp -a drivers/media/usb/${i}/*.h ${hdrdest}/drivers/media/usb/${i}
|
||||
done
|
||||
# i2c
|
||||
mkdir -p ${hdrdest}/drivers/media/i2c
|
||||
cp drivers/media/i2c/*.h ${hdrdest}/drivers/media/i2c
|
||||
for i in cx25840; do
|
||||
mkdir -p ${hdrdest}/drivers/media/i2c/${i}
|
||||
cp -a drivers/media/i2c/${i}/*.h ${hdrdest}/drivers/media/i2c/${i}
|
||||
done
|
||||
|
||||
# Add docbook makefile
|
||||
install -Dm644 Documentation/DocBook/Makefile \
|
||||
${hdrdest}/Documentation/DocBook/Makefile
|
||||
|
||||
# Add md headers
|
||||
mkdir -p ${hdrdest}/drivers/md
|
||||
cp drivers/md/*.h ${hdrdest}/drivers/md
|
||||
|
||||
# Add inotify.h
|
||||
mkdir -p ${hdrdest}/include/linux
|
||||
cp include/linux/inotify.h ${hdrdest}/include/linux
|
||||
|
||||
# Add wireless headers
|
||||
mkdir -p ${hdrdest}/net/mac80211/
|
||||
cp net/mac80211/*.h ${hdrdest}/net/mac80211
|
||||
|
||||
# add dvb headers for external modules
|
||||
mkdir -p ${hdrdest}/drivers/media/dvb-core
|
||||
cp drivers/media/dvb-core/*.h ${hdrdest}/drivers/media/dvb-core/
|
||||
mkdir -p ${hdrdest}/include/config/dvb/
|
||||
cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
|
||||
|
||||
# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
|
||||
mkdir -p ${hdrdest}/drivers/media/dvb-frontends
|
||||
cp drivers/media/dvb-frontends/lgdt330x.h \
|
||||
${hdrdest}/drivers/media/dvb-frontends/
|
||||
cp drivers/media/i2c/msp3400-driver.h ${hdrdest}/drivers/media/i2c/
|
||||
|
||||
# add dvb headers
|
||||
mkdir -p ${hdrdest}/drivers/media/usb/dvb-usb
|
||||
cp drivers/media/usb/dvb-usb/*.h ${hdrdest}/drivers/media/usb/dvb-usb/
|
||||
mkdir -p ${hdrdest}/drivers/media/dvb-frontends
|
||||
cp drivers/media/dvb-frontends/*.h ${hdrdest}/drivers/media/dvb-frontends/
|
||||
mkdir -p ${hdrdest}/drivers/media/tuners
|
||||
cp drivers/media/tuners/*.h ${hdrdest}/drivers/media/tuners/
|
||||
|
||||
# Add xfs and shmem for aufs building
|
||||
mkdir -p ${hdrdest}/fs/xfs
|
||||
mkdir -p ${hdrdest}/mm
|
||||
cp fs/xfs/xfs_sb.h ${hdrdest}/fs/xfs/xfs_sb.h
|
||||
|
||||
# Copy in Kconfig files
|
||||
for i in $(find . -name "Kconfig*"); do
|
||||
mkdir -p ${hdrdest}/$(echo $i | sed 's|/Kconfig.*||')
|
||||
cp $i ${hdrdest}/$i
|
||||
done
|
||||
|
||||
# Remove unneeded architectures
|
||||
for arch in alpha arm* avr32 blackfin cris frv h8300 \
|
||||
ia64 m* p* s* um v850 xtensa; do
|
||||
rm -rf ${hdrdest}/arch/${arch}
|
||||
done
|
||||
|
||||
# Compress all modules with gzip to save a few MBs.
|
||||
msg_normal "$pkgver: compressing kernel modules with gzip, please wait...\n"
|
||||
find ${DESTDIR} -name '*.ko' -exec gzip -9 {} \;
|
||||
|
||||
# ... and run depmod again.
|
||||
depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
|
||||
}
|
||||
|
||||
linux3.9-headers_package() {
|
||||
preserve=yes
|
||||
nostrip=yes
|
||||
noverifyrdeps=yes
|
||||
short_desc+=" - source headers for 3rd party modules"
|
||||
pkg_install() {
|
||||
vmove usr/src
|
||||
vmove usr/lib/modules/${_kernver}/build
|
||||
}
|
||||
}
|
||||
|
||||
linux3.9_package() {
|
||||
nostrip=yes
|
||||
noverifyrdeps=yes
|
||||
preserve=yes
|
||||
triggers="kernel-hooks"
|
||||
depends="dracut linux-firmware kmod>=11_2"
|
||||
# These files could be modified when an external module is built.
|
||||
mutable_files="
|
||||
/usr/lib/modules/${_kernver}/modules.dep
|
||||
/usr/lib/modules/${_kernver}/modules.dep.bin
|
||||
/usr/lib/modules/${_kernver}/modules.symbols
|
||||
/usr/lib/modules/${_kernver}/modules.symbols.bin
|
||||
/usr/lib/modules/${_kernver}/modules.alias
|
||||
/usr/lib/modules/${_kernver}/modules.alias.bin
|
||||
/usr/lib/modules/${_kernver}/modules.devname"
|
||||
pkg_install() {
|
||||
vmove all
|
||||
}
|
||||
}
|
||||
13
srcpkgs/mailx/patches/mailx-12.5-collect.patch
Normal file
13
srcpkgs/mailx/patches/mailx-12.5-collect.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
--- mailx-12.4.orig/collect.c 2012-09-12 16:07:53.653103796 -0400
|
||||
+++ mailx-12.4/collect.c 2012-09-12 21:27:05.092259236 -0400
|
||||
@@ -905,7 +905,9 @@ err:
|
||||
if (collf != NULL) {
|
||||
Fclose(collf);
|
||||
collf = NULL;
|
||||
- }
|
||||
+ } else {
|
||||
+ exit(1);
|
||||
+ }
|
||||
out:
|
||||
if (collf != NULL) {
|
||||
if ((cp = value("MAILX_TAIL")) != NULL) {
|
||||
12
srcpkgs/mailx/patches/mailx-12.5-fname-null.patch
Normal file
12
srcpkgs/mailx/patches/mailx-12.5-fname-null.patch
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
diff -upr mailx-12.5.orig/names.c mailx-12.5/names.c
|
||||
--- mailx-12.5.orig/names.c 2006-03-04 01:32:16.000000000 +0100
|
||||
+++ mailx-12.5/names.c 2012-11-01 15:28:43.883573793 +0100
|
||||
@@ -357,7 +357,7 @@ outof(struct name *names, FILE *fo, stru
|
||||
free_child(pid);
|
||||
} else {
|
||||
int f;
|
||||
- if ((fout = Zopen(fname, "a", NULL)) == NULL) {
|
||||
+ if ((fname == NULL) || ((fout = Zopen(fname, "a", NULL)) == NULL)) {
|
||||
perror(fname);
|
||||
senderr++;
|
||||
goto cant;
|
||||
12
srcpkgs/mailx/patches/mailx-12.5-lzw.patch
Normal file
12
srcpkgs/mailx/patches/mailx-12.5-lzw.patch
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
diff -Nrbu mailx-12.5/lzw.c mailx-12.5-OK/lzw.c
|
||||
--- mailx-12.5/lzw.c 2006-03-04 03:32:16.000000000 +0300
|
||||
+++ mailx-12.5-OK/lzw.c 2011-08-17 16:30:01.000000000 +0400
|
||||
@@ -516,6 +516,8 @@
|
||||
|
||||
/* Generate output characters in reverse order. */
|
||||
while (code >= 256) {
|
||||
+ if (stackp - de_stack >= HSIZE - 1)
|
||||
+ return -1;
|
||||
*stackp++ = tab_suffixof(code);
|
||||
code = tab_prefixof(code);
|
||||
}
|
||||
12
srcpkgs/mailx/patches/mailx-12.5-usage.patch
Normal file
12
srcpkgs/mailx/patches/mailx-12.5-usage.patch
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
diff -upr mailx-12.5.orig/main.c mailx-12.5/main.c
|
||||
--- mailx-12.5.orig/main.c 2007-10-02 14:15:50.000000000 +0200
|
||||
+++ mailx-12.5/main.c 2013-07-22 16:06:56.960765683 +0200
|
||||
@@ -353,7 +353,7 @@ main(int argc, char *argv[])
|
||||
case '?':
|
||||
usage:
|
||||
fprintf(stderr, catgets(catd, CATSET, 135,
|
||||
-"Usage: %s -eiIUdEFntBDNHRV~ -T FILE -u USER -h hops -r address -s SUBJECT -a FILE -q FILE -f FILE -A ACCOUNT -b USERS -c USERS -S OPTION users\n"), progname);
|
||||
+"Usage: %s -eiIUdEFntBDNHRVv~ -T FILE -u USER -h hops -r address -s SUBJECT -a FILE -q FILE -f FILE -A ACCOUNT -b USERS -c USERS -S OPTION users\n"), progname);
|
||||
exit(2);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,63 +1,45 @@
|
|||
# Template file for 'mailx'
|
||||
pkgname=mailx
|
||||
version=12.5
|
||||
revision=2
|
||||
revision=4
|
||||
patch_args="-Np1"
|
||||
wrksrc=mailx-${version}
|
||||
wrksrc="mailx-${version}"
|
||||
makedepends="openssl-devel mit-krb5-devel"
|
||||
short_desc="Feature-rich BSD mail(1)"
|
||||
homepage="http://heirloom.sourceforge.net/mailx.html"
|
||||
license="Custom"
|
||||
license="BSD"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
distfiles="http://pkgs.fedoraproject.org/repo/pkgs/mailx/mailx-12.5.tar.xz/836bf1da322d2d1f78b7056c2b3b2304/${pkgname}-${version}.tar.xz"
|
||||
distfiles="http://pkgs.fedoraproject.org/repo/pkgs/mailx/mailx-${version}.tar.xz/836bf1da322d2d1f78b7056c2b3b2304/${pkgname}-${version}.tar.xz"
|
||||
checksum=1b8136fb2466adeaf71a5e3c65db9fa1a967f1f6469ff689c2cf06e21f638823
|
||||
long_desc="
|
||||
Mailx is an enhanced mail command, which provides the functionality
|
||||
of the POSIX mailx command, as well as SysV mail and Berkeley Mail
|
||||
(from which it is derived).
|
||||
|
||||
Additionally to the POSIX features, mailx can work with Maildir/ e-mail
|
||||
storage format (as well as mailboxes), supports IMAP, POP3 and SMTP
|
||||
procotols (including over SSL) to operate with remote hosts, handles mime
|
||||
types and different charsets. There are a lot of other useful features,
|
||||
see mailx(1).
|
||||
|
||||
And as its ancient analogues, mailx can be used as a mail script language,
|
||||
both for sending and receiving mail.
|
||||
|
||||
Besides the "mailx" command, this package provides "mail" and "Mail"
|
||||
(which should be compatible with its predecessors from the mailx-8.x source),
|
||||
as well as "nail" (the initial name of this project)."
|
||||
|
||||
disable_parallel_build=yes
|
||||
|
||||
do_build() {
|
||||
echo PREFIX=/usr \
|
||||
BINDIR=/bin \
|
||||
MANDIR=/usr/share/man \
|
||||
SYSCONFDIR=/etc \
|
||||
MAILRC=/etc/mail.rc \
|
||||
echo PREFIX=/usr \
|
||||
BINDIR=/usr/bin \
|
||||
MANDIR=/usr/share/man \
|
||||
SYSCONFDIR=/etc \
|
||||
MAILRC=/etc/mail.rc \
|
||||
MAILSPOOL=/var/spool/mail \
|
||||
UCBINSTALL=install \
|
||||
> ${wrksrc}/makeflags
|
||||
UCBINSTALL=install \
|
||||
STRIP=$STRIP \
|
||||
SENDMAIL=/usr/bin/sendmail \
|
||||
> makeflags
|
||||
|
||||
make $(cat makeflags) CFLAGS="${CFLAGS} -D_GNU_SOURCE" \
|
||||
IPv6=-DHAVE_IPv6_FUNCS
|
||||
make $(cat makeflags) IPv6=-DHAVE_IPv6_FUNCS \
|
||||
CFLAGS="${CFLAGS} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64"
|
||||
}
|
||||
|
||||
do_install() {
|
||||
make DESTDIR=${DESTDIR} $(cat makeflags) install
|
||||
|
||||
ln -s mailx ${DESTDIR}/bin/mail
|
||||
ln -s mailx ${DESTDIR}/bin/Mail
|
||||
ln -s mailx ${DESTDIR}/usr/bin/mail
|
||||
ln -s mailx.1 ${DESTDIR}/usr/share/man/man1/mail.1
|
||||
ln -s mailx.1 ${DESTDIR}/usr/share/man/man1/Mail.1
|
||||
}
|
||||
|
||||
mailx_package() {
|
||||
conf_files="/etc/mail.rc"
|
||||
provides="mail-${version}"
|
||||
replaces="mail>=0"
|
||||
pkg_install() {
|
||||
vmove etc
|
||||
vmove usr
|
||||
vmove all
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
# Template file for 'man-pages'
|
||||
pkgname=man-pages
|
||||
version=3.53
|
||||
version=3.55
|
||||
revision=1
|
||||
short_desc="Linux Documentation Project (LDP) manual pages"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
license="GPL-2"
|
||||
homepage="http://man7.org/linux/man-pages/index.html"
|
||||
distfiles="${KERNEL_SITE}/docs/man-pages/$pkgname-$version.tar.xz"
|
||||
checksum=d4764d8225d73fd3ca9202b73da0ab52614faa8e727c45cd5ec715c3b393f34f
|
||||
checksum=91b57467a5464ec8c0a089277a7a7960b316c75c5a0c91dcf002df6d8bf1e818
|
||||
|
||||
do_install() {
|
||||
make all prefix=${DESTDIR}/usr
|
||||
|
|
@ -38,6 +38,6 @@ do_install() {
|
|||
man-pages_package() {
|
||||
noarch="yes"
|
||||
pkg_install() {
|
||||
vmove usr
|
||||
vmove all
|
||||
}
|
||||
}
|
||||
|
|
|
|||
1
srcpkgs/muffin-devel
Symbolic link
1
srcpkgs/muffin-devel
Symbolic link
|
|
@ -0,0 +1 @@
|
|||
muffin
|
||||
40
srcpkgs/muffin/template
Normal file
40
srcpkgs/muffin/template
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
# Template file for 'muffin'
|
||||
pkgname=muffin
|
||||
version=2.0.5
|
||||
revision=2
|
||||
short_desc="Cinnamon window manager based on Mutter"
|
||||
build_style=gnu-configure
|
||||
configure_args="--disable-static --disable-schemas-compile"
|
||||
hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection
|
||||
gettext-devel intltool which gnome-doc-utils"
|
||||
makedepends="clutter-devel startup-notification-devel libcanberra-devel
|
||||
cinnamon-desktop-devel libXinerama-devel libSM-devel dconf zenity"
|
||||
maintainer="Roelof Wobben <rwobben@hotmail.com>"
|
||||
license="GPL-3"
|
||||
homepage="http://cinnamon.linuxmint.com/"
|
||||
|
||||
do_fetch() {
|
||||
git clone -b ${version} git://github.com/linuxmint/${pkgname} ${pkgname}-${version}
|
||||
}
|
||||
|
||||
pre_configure() {
|
||||
./autogen.sh
|
||||
}
|
||||
|
||||
muffin-devel_package() {
|
||||
depends="libX11-devel gtk+3-devel cinnamon-desktop-devel clutter-devel ${sourcepkg}>=${version}_${revision}"
|
||||
short_desc+=" - development files"
|
||||
pkg_install() {
|
||||
vmove "usr/lib/*.so"
|
||||
vmove usr/include
|
||||
vmove usr/lib/pkgconfig
|
||||
}
|
||||
}
|
||||
|
||||
muffin_package() {
|
||||
depends="dconf zenity"
|
||||
pkg_install() {
|
||||
vmove all
|
||||
}
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue