Merge branch 'master' into wine
This commit is contained in:
xdave
commit
48dad5befa
|
|
@ -803,10 +803,6 @@ librest-extras-0.7.so.0 rest-0.7_1
|
|||
libgoa-1.0.so.0 gnome-online-accounts-3.2.0_1
|
||||
libgoa-backend-1.0.so.1 gnome-online-accounts-3.10.0_1
|
||||
liboauth.so.0 liboauth-0.9.4_1
|
||||
libsocialweb.so.0 libsocialweb-0.25.19_1
|
||||
libsocialweb-keyfob.so.0 libsocialweb-0.25.19_1
|
||||
libsocialweb-keystore.so.0 libsocialweb-0.25.19_1
|
||||
libsocialweb-client.so.2 libsocialweb-0.25.19_1
|
||||
liblcms2.so.2 lcms2-2.2_1
|
||||
libcolord.so.1 libcolord-0.1.23_3
|
||||
libcolordprivate.so.1 libcolord-0.1.31_1
|
||||
|
|
@ -867,7 +863,7 @@ libgiggle.so.0 libgiggle-0.6.1_1
|
|||
libgiggle-git.so.0 libgiggle-0.6.1_1
|
||||
libwine.so.1 libwine-1.6_1
|
||||
libwv-1.2.so.3 libwv-1.2.4_1
|
||||
libabiword-2.8.so libabiword-2.8.6_1
|
||||
libabiword-3.0.so libabiword-3.0.0_1
|
||||
libmpg123.so.0 libmpg123-1.13.4_2_1
|
||||
libopenal.so.1 libopenal-1.13_1
|
||||
libalut.so.0 freealut-1.1.0_1
|
||||
|
|
@ -1271,7 +1267,7 @@ libsopranoindex.so.1 soprano-2.9.2_1
|
|||
libsopranoclient.so.1 soprano-2.9.2_1
|
||||
libsopranoserver.so.1 soprano-2.9.2_1
|
||||
libsoprano.so.4 soprano-2.9.2_1
|
||||
librasqal.so.3 rasqal-0.9.30_1
|
||||
librasqal.so.3 librasqal-0.9.30_1
|
||||
librdf.so.0 librdf-1.0.16_1
|
||||
libkdecore.so.5 kdelibs-4.10.4_1
|
||||
libclucene-core.so.1 clucene-2.3.3.4_1
|
||||
|
|
|
|||
1
srcpkgs/abiword-plugins
Symbolic link
1
srcpkgs/abiword-plugins
Symbolic link
|
|
@ -0,0 +1 @@
|
|||
abiword
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
diff -u -r abiword-2.8.6.orig/src/Makefile.am abiword-2.8.6/src/Makefile.am
|
||||
--- src/Makefile.am 2009-09-09 15:11:01.000000000 +0200
|
||||
+++ src/Makefile.am 2011-08-02 23:35:51.904761961 +0200
|
||||
@@ -107,7 +107,7 @@
|
||||
|
||||
AbiWord_LDFLAGS = \
|
||||
$(DEPS_LIBS) \
|
||||
- --no-undefined \
|
||||
+ -Wl,--no-undefined \
|
||||
-avoid-version \
|
||||
-export-dynamic \
|
||||
-headerpad_max_install_names
|
||||
@@ -129,7 +129,7 @@
|
||||
|
||||
abiword_LDFLAGS = \
|
||||
$(platform_ldflags) \
|
||||
- --no-undefined \
|
||||
+ -Wl,--no-undefined \
|
||||
-avoid-version \
|
||||
-export-dynamic
|
||||
|
||||
|
|
@ -1,107 +0,0 @@
|
|||
--- plugins/bmp/xp/ie_impGraphic_BMP.cpp.png15 2012-02-27 15:39:39.258617605 -0500
|
||||
+++ plugins/bmp/xp/ie_impGraphic_BMP.cpp 2012-02-27 15:48:37.830936901 -0500
|
||||
@@ -191,7 +191,14 @@ UT_Error IE_ImpGraphic_BMP::_convertGrap
|
||||
|
||||
/* Clean Up Memory Used */
|
||||
|
||||
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
|
||||
+ int num_palette;
|
||||
+ png_colorp palette;
|
||||
+ png_get_PLTE(m_pPNG, m_pPNGInfo, &palette, &num_palette);
|
||||
+ FREEP(palette);
|
||||
+#else
|
||||
FREEP(m_pPNGInfo->palette);
|
||||
+#endif
|
||||
DELETEP(pBB);
|
||||
png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
|
||||
|
||||
@@ -313,7 +320,11 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P
|
||||
* the normal method of doing things with libpng). REQUIRED unless you
|
||||
* set up your own error handlers in the png_create_read_struct() earlier.
|
||||
*/
|
||||
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
|
||||
+ if (setjmp(png_jmpbuf(m_pPNG)))
|
||||
+#else
|
||||
if (setjmp(m_pPNG->jmpbuf))
|
||||
+#endif
|
||||
{
|
||||
/* Free all of the memory associated with the png_ptr and info_ptr */
|
||||
png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
|
||||
@@ -332,7 +343,11 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P
|
||||
UT_Error IE_ImpGraphic_BMP::Convert_BMP_Pallet(UT_ByteBuf* pBB)
|
||||
{
|
||||
/* Reset error handling for libpng */
|
||||
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
|
||||
+ if (setjmp(png_jmpbuf(m_pPNG)))
|
||||
+#else
|
||||
if (setjmp(m_pPNG->jmpbuf))
|
||||
+#endif
|
||||
{
|
||||
png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
|
||||
return UT_ERROR;
|
||||
@@ -372,7 +387,11 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P
|
||||
UT_Error IE_ImpGraphic_BMP::Convert_BMP(UT_ByteBuf* pBB)
|
||||
{
|
||||
/* Reset error handling for libpng */
|
||||
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
|
||||
+ if (setjmp(png_jmpbuf(m_pPNG)))
|
||||
+#else
|
||||
if (setjmp(m_pPNG->jmpbuf))
|
||||
+#endif
|
||||
{
|
||||
png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
|
||||
return UT_ERROR;
|
||||
--- plugins/garble/xp/abiword-garble-png.cpp.png15 2012-02-27 15:31:30.178868169 -0500
|
||||
+++ plugins/garble/xp/abiword-garble-png.cpp 2012-02-27 15:36:17.795368497 -0500
|
||||
@@ -79,7 +79,11 @@ bool abiword_document::garble_png( void*
|
||||
png_set_strip_alpha( png_ptr );
|
||||
png_set_interlace_handling( png_ptr );
|
||||
png_set_bgr( png_ptr );
|
||||
+#if (PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4) && defined(PNG_EASY_ACCESS_SUPPORTED)
|
||||
+ rowbytes = png_get_rowbytes( png_ptr, info_ptr );
|
||||
+#else
|
||||
rowbytes = info_ptr->rowbytes;
|
||||
+#endif
|
||||
png_destroy_read_struct( &png_ptr, &info_ptr, NULL );
|
||||
}
|
||||
|
||||
--- src/af/util/xp/ut_png.cpp.png15 2012-02-27 15:11:18.599397989 -0500
|
||||
+++ src/af/util/xp/ut_png.cpp 2012-02-27 15:12:20.560859433 -0500
|
||||
@@ -71,7 +71,11 @@ bool UT_PNG_getDimensions(const UT_ByteB
|
||||
* the normal method of doing things with libpng). REQUIRED unless you
|
||||
* set up your own error handlers in the png_create_read_struct() earlier.
|
||||
*/
|
||||
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
|
||||
+ if (setjmp(png_jmpbuf(png_ptr)))
|
||||
+#else
|
||||
if (setjmp(png_ptr->jmpbuf))
|
||||
+#endif
|
||||
{
|
||||
/* Free all of the memory associated with the png_ptr and info_ptr */
|
||||
png_destroy_read_struct(&png_ptr, &info_ptr, static_cast<png_infopp>(NULL));
|
||||
--- src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp.png15 2012-02-27 15:24:23.959572417 -0500
|
||||
+++ src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp 2012-02-27 15:26:42.549367943 -0500
|
||||
@@ -185,7 +185,11 @@ UT_Error IE_ImpGraphic_GdkPixbuf::import
|
||||
/** needed for the stejmp context */
|
||||
UT_Error IE_ImpGraphic_GdkPixbuf::_png_write(GdkPixbuf * pixbuf)
|
||||
{
|
||||
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
|
||||
+ if (setjmp(png_jmpbuf(m_pPNG)))
|
||||
+#else
|
||||
if (setjmp(m_pPNG->jmpbuf))
|
||||
+#endif
|
||||
{
|
||||
DELETEP(m_pPngBB);
|
||||
png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
|
||||
@@ -446,7 +450,11 @@ UT_Error IE_ImpGraphic_GdkPixbuf::Initia
|
||||
* the normal method of doing things with libpng). REQUIRED unless you
|
||||
* set up your own error handlers in the png_create_read_struct() earlier.
|
||||
*/
|
||||
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
|
||||
+ if (setjmp(png_jmpbuf(m_pPNG)))
|
||||
+#else
|
||||
if (setjmp(m_pPNG->jmpbuf))
|
||||
+#endif
|
||||
{
|
||||
/* Free all of the memory associated with the png_ptr and info_ptr */
|
||||
png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
|
||||
|
|
@ -0,0 +1,33 @@
|
|||
commit e0e81e6c2d7f2478b9effc8476b62425ca2c12cd
|
||||
Author: Hubert Figuière <hub@figuiere.net>
|
||||
Date: Wed Oct 16 22:48:36 2013 -0400
|
||||
|
||||
Bug 13564 - Fix crash in abw to HTML conversion.
|
||||
|
||||
diff --git a/src/wp/impexp/xp/ie_exp_HTML_Listener.cpp b/src/wp/impexp/xp/ie_exp_HTML_Listener.cpp
|
||||
index 86c57ec..b9dace1 100644
|
||||
--- src/wp/impexp/xp/ie_exp_HTML_Listener.cpp
|
||||
+++ src/wp/impexp/xp/ie_exp_HTML_Listener.cpp
|
||||
@@ -2232,12 +2232,18 @@ void IE_Exp_HTML_Listener::_openList(PT_AttrPropIndex api, bool recursiveCall)
|
||||
_openList(api, true);
|
||||
}
|
||||
}
|
||||
-
|
||||
- }else
|
||||
+ }
|
||||
+ else
|
||||
{
|
||||
- const gchar* szListStyle;
|
||||
+ const gchar* szListStyle = NULL;
|
||||
pAP->getProperty("list-style", szListStyle);
|
||||
- bool isOrdered = g_ascii_strcasecmp(szListStyle, "Bullet List") != 0;
|
||||
+ bool isOrdered = szListStyle
|
||||
+ && (g_ascii_strcasecmp(szListStyle, "Bullet List") != 0);
|
||||
+#ifdef DEBUG
|
||||
+ if(!szListStyle) {
|
||||
+ UT_DEBUGMSG(("***BUG*** szListStyle is NULL - http://bugzilla.abisource.com/show_bug.cgi?id=13564\n"));
|
||||
+ }
|
||||
+#endif
|
||||
ListInfo info;
|
||||
if (iCurrentLevel == 0)
|
||||
{
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
--- goffice-bits/goffice/utils/go-glib-extras.c.orig 2012-05-24 12:07:28.399969286 +0200
|
||||
+++ goffice-bits/goffice/utils/go-glib-extras.c 2012-05-24 12:08:35.993335129 +0200
|
||||
@@ -11,7 +11,7 @@
|
||||
#include <goffice/goffice-config.h>
|
||||
#include "go-glib-extras.h"
|
||||
|
||||
-#include <glib/gi18n-lib.h>
|
||||
+#include <glib.h>
|
||||
#include <gsf/gsf-impl-utils.h>
|
||||
#include <libxml/encoding.h>
|
||||
|
||||
--- goffice-bits/goffice/app/goffice-app.h.orig 2012-05-24 12:09:06.121606751 +0200
|
||||
+++ goffice-bits/goffice/app/goffice-app.h 2012-05-24 12:09:15.321462357 +0200
|
||||
@@ -22,7 +22,7 @@
|
||||
#ifndef GOFFICE_APP_H
|
||||
#define GOFFICE_APP_H
|
||||
|
||||
-#include <glib/gmacros.h>
|
||||
+#include <glib.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
--- src/af/util/xp/ut_go_file.h.orig 2012-05-24 12:11:30.229201580 +0200
|
||||
+++ src/af/util/xp/ut_go_file.h 2012-05-24 12:11:41.052939975 +0200
|
||||
@@ -31,7 +31,6 @@
|
||||
|
||||
#include <glib.h>
|
||||
#include <gsf/gsf.h>
|
||||
-#include <glib/gerror.h>
|
||||
#include <time.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
|
@ -1,29 +1,23 @@
|
|||
# Template file for 'abiword'
|
||||
pkgname=abiword
|
||||
version=2.8.6
|
||||
revision=8
|
||||
version=3.0.0
|
||||
revision=2
|
||||
build_style=gnu-configure
|
||||
configure_args="--enable-shave --enable-collab-backend-telepathy
|
||||
--enable-collab-backend-tcp --enable-collab-backend-service
|
||||
--enable-templates --enable-clipart --enable-plugins --with-gio
|
||||
--disable-static"
|
||||
configure_args="--enable-plugins --enable-clipart --enable-templates"
|
||||
hostmakedepends="automake libtool flex pkg-config"
|
||||
makedepends="libjpeg-turbo-devel libpng-devel>=1.6
|
||||
fribidi-devel libgsf-devel enchant-devel gtk+-devel librsvg-devel
|
||||
wv-devel boost-devel libxslt-devel libwmf-devel"
|
||||
fribidi-devel libgsf-devel enchant-devel gtk+3-devel librsvg-devel
|
||||
wv-devel boost-devel libxslt-devel libwmf-devel libchamplain-devel
|
||||
redland-devel libical-devel"
|
||||
short_desc="Free word processing program similar to Microsoft(R) Word"
|
||||
maintainer="davehome <davehome@redthumb.info.tm>"
|
||||
license="GPL-3"
|
||||
homepage="http://www.abisource.com/"
|
||||
distfiles="${homepage}/downloads/${pkgname}/${version}/source/${pkgname}-${version}.tar.gz"
|
||||
checksum=d99089a63a6cfc1a6a4a026be9278028d47d224088d24b1853acb67e95683a15
|
||||
checksum=d17e318c00ff4eb353e0e7994b098b1d4f9ddd8712ac0261a0e38b89081fac01
|
||||
|
||||
CPPFLAGS="-I/usr/include/boost"
|
||||
|
||||
pre_configure() {
|
||||
autoreconf -fi
|
||||
}
|
||||
|
||||
libabiword_package() {
|
||||
short_desc+=" - Runtime library"
|
||||
pkg_install() {
|
||||
|
|
@ -31,6 +25,13 @@ libabiword_package() {
|
|||
}
|
||||
}
|
||||
|
||||
abiword-plugins_package() {
|
||||
short_desc+=" - Plugins"
|
||||
pkg_install() {
|
||||
vmove usr/lib/abiword-3.0/plugins
|
||||
}
|
||||
}
|
||||
|
||||
abiword-devel_package() {
|
||||
depends="fribidi-devel libgsf-devel wv-devel enchant-devel gtk-devel
|
||||
librsvg-devel libabiword>=${version}"
|
||||
|
|
|
|||
|
|
@ -1,16 +1,20 @@
|
|||
# Template file for 'f2fs-tools'
|
||||
pkgname=f2fs-tools
|
||||
version=1.1.0
|
||||
version=1.2.0
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
hostmakedepends="automake"
|
||||
configure_args="--sbindir=/usr/bin --disable-static"
|
||||
make_install_args="sbindir=/usr/bin"
|
||||
hostmakedepends="automake libtool pkg-config"
|
||||
makedepends="libuuid-devel"
|
||||
short_desc="Tools for the Linux Flash-Friendly File System (F2FS)"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
license="GPL-2"
|
||||
homepage="http://sourceforge.net/projects/f2fs-tools/"
|
||||
distfiles="http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/${pkgname}-${version}.tar.gz"
|
||||
checksum=c8cfb6895a0b3775f0df00a776fd451558739289684dd43f1fd75f876fa62867
|
||||
homepage="http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git"
|
||||
|
||||
do_fetch() {
|
||||
git clone -b v${version} git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git ${pkgname}-${version}
|
||||
}
|
||||
|
||||
pre_configure() {
|
||||
autoreconf -fi
|
||||
|
|
@ -18,6 +22,6 @@ pre_configure() {
|
|||
|
||||
f2fs-tools_package() {
|
||||
pkg_install() {
|
||||
vmove usr
|
||||
vmove all
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
# Template file for 'gnome-control-center'
|
||||
pkgname=gnome-control-center
|
||||
version=3.10.1
|
||||
revision=1
|
||||
revision=2
|
||||
build_style=gnu-configure
|
||||
configure_args="--disable-static --with-cheese --with-libsocialweb"
|
||||
configure_args="--disable-static --with-cheese --without-libsocialweb"
|
||||
short_desc="The GNOME control center"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
license="GPL-2"
|
||||
|
|
@ -13,9 +13,9 @@ checksum=fbfc1a935c33901c6afc999160696e0cde60ccb9997679cc8d0a2ff952568cbe
|
|||
|
||||
hostmakedepends="which pkg-config intltool gnome-doc-utils gobject-introspection"
|
||||
|
||||
makedepends="libXi-devel colord-devel>=0.1.3 libsocialweb-devel>=0.25.21
|
||||
gsettings-desktop-schemas-devel>=3.10 samba-devel
|
||||
gnome-desktop-devel>=3.10 libgnomekbd-devel>=3.6.0
|
||||
makedepends="
|
||||
libXi-devel colord-devel>=0.1.3 libsoup-devel gsettings-desktop-schemas-devel>=3.10
|
||||
gnome-desktop-devel>=3.10 libgnomekbd-devel>=3.6.0 samba-devel
|
||||
gnome-menus-devel>=3.8 network-manager-applet-devel
|
||||
gnome-settings-daemon-devel>=3.10 gnome-online-accounts-devel>=3.10
|
||||
libcanberra-devel polkit-devel libgtop-devel
|
||||
|
|
@ -37,8 +37,7 @@ gnome-control-center-devel_package() {
|
|||
}
|
||||
|
||||
gnome-control-center_package() {
|
||||
depends="libsocialweb>=0.25.21
|
||||
gsettings-desktop-schemas>=3.10
|
||||
depends="gsettings-desktop-schemas>=3.10
|
||||
pulseaudio desktop-file-utils
|
||||
ModemManager hicolor-icon-theme
|
||||
sound-theme-freedesktop apg iso-codes"
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
libsocialweb
|
||||
|
|
@ -1,42 +0,0 @@
|
|||
# Template file for 'libsocialweb'
|
||||
pkgname=libsocialweb
|
||||
version=0.25.21
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--enable-all-services=yes --with-online=always
|
||||
--enable-vala-bindings"
|
||||
hostmakedepends="pkg-config intltool libxslt docbook-xsl gobject-introspection"
|
||||
makedepends="vala-devel rest-devel>=0.7.90 dbus-glib-devel libgnome-keyring-devel
|
||||
GConf-devel json-glib-devel libsoup-gnome-devel>=2.44"
|
||||
short_desc="A personal social data server"
|
||||
homepage="http://gnome.org"
|
||||
license="LGPL-2.1"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
distfiles="${GNOME_SITE}/$pkgname/0.25/$pkgname-$version.tar.xz"
|
||||
checksum=f676567640cede66b6ff62f440c968943c2f3a164dd5f26155b6154ab93bf687
|
||||
long_desc="
|
||||
libfolks is a library that aggregates people from multiple sources (eg,
|
||||
Telepathy connection managers and eventually evolution data server, Facebook,
|
||||
etc.) to create metacontacts. It's written in Vala (in part to evaluate Vala).
|
||||
The initial goal is for GObject/C support, though the Vala bindings should
|
||||
basically automatic."
|
||||
|
||||
libsocialweb-devel_package() {
|
||||
depends="dbus-glib-devel rest-devel>=0.7.90 libsoup-gnome-devel>=2.44 libsocialweb>=${version}"
|
||||
short_desc+=" -- development files"
|
||||
pkg_install() {
|
||||
vmove usr/include
|
||||
vmove usr/lib/pkgconfig
|
||||
vmove usr/share/gir-1.0
|
||||
vmove usr/share/gtk-doc
|
||||
vmove usr/share/vala
|
||||
vmove "usr/lib/*.so"
|
||||
}
|
||||
}
|
||||
|
||||
libsocialweb_package() {
|
||||
depends="rest>=0.7.90 libsoup-gnome>=2.44"
|
||||
pkg_install() {
|
||||
vmove all
|
||||
}
|
||||
}
|
||||
|
|
@ -1,16 +1,17 @@
|
|||
# Template file for 'lxappearance'
|
||||
pkgname=lxappearance
|
||||
version=0.5.1
|
||||
revision=2
|
||||
version=0.5.3
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--enable-dbus"
|
||||
hostmakedepends="pkg-config intltool"
|
||||
makedepends="gtk+-devel desktop-file-utils"
|
||||
makedepends="gtk+-devel dbus-glib-devel desktop-file-utils"
|
||||
short_desc="LXDE Theme Switcher"
|
||||
homepage="http://lxde.org/"
|
||||
license="GPL2"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
distfiles="${SOURCEFORGE_SITE}/lxde/$pkgname-$version.tar.gz"
|
||||
checksum=74e638257092201a572f1fcd4eb93c195c9fa75e27602662de542b002e6deade
|
||||
checksum=258069e61a1c898d1a095af25e386b3fcb79dc11024e4a0d9231a4316bfd1a2d
|
||||
long_desc="
|
||||
LXAppearance is the standard theme switcher of LXDE. Users are able to
|
||||
change the theme, icons, and fonts used by applications easily."
|
||||
|
|
@ -18,6 +19,6 @@ long_desc="
|
|||
lxappearance_package() {
|
||||
depends="desktop-file-utils"
|
||||
pkg_install() {
|
||||
vmove usr
|
||||
vmove all
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,24 +1,21 @@
|
|||
# Template file for 'lxde-icon-theme'
|
||||
pkgname=lxde-icon-theme
|
||||
version=0.0.1
|
||||
revision=2
|
||||
version=0.5.0
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
hostmakedepends="pkg-config"
|
||||
makedepends="gtk+-devel"
|
||||
short_desc="LXDE Standard icon theme"
|
||||
short_desc="LXDE default default icon theme based on nuoveXT2"
|
||||
homepage="http://lxde.org/"
|
||||
license="GPL2"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
distfiles="${SOURCEFORGE_SITE}/lxde/$pkgname-$version.tar.bz2"
|
||||
checksum=a75c0412033a0a0bf6b3912bb37409fbdae1b9a574f2821929aca8749e7ff3a3
|
||||
long_desc="
|
||||
This package contains lxde-icon-theme which is the default icon theme
|
||||
for LXDE, also known as nuoveXT2 icon theme."
|
||||
checksum=49dc61c46c4a0ca9298f9e0866bcf7212a08ddaa71f15bfabfb0220fe1efa848
|
||||
|
||||
lxde-icon-theme_package() {
|
||||
noarch="yes"
|
||||
depends="gtk+"
|
||||
depends="gtk-update-icon-cache"
|
||||
pkg_install() {
|
||||
vmove usr
|
||||
vmove all
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +0,0 @@
|
|||
[Unit]
|
||||
Description=LXDE Display Manager
|
||||
After=systemd-user-sessions.service
|
||||
|
||||
[Service]
|
||||
ExecStart=/usr/sbin/lxdm-binary
|
||||
Restart=always
|
||||
|
||||
[Install]
|
||||
Alias=display-manager.service
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
--- data/Xsession.orig 2011-07-29 15:42:33.000000000 +0200
|
||||
+++ data/Xsession 2011-12-03 09:09:14.592876087 +0100
|
||||
@@ -9,6 +9,8 @@
|
||||
LXSESSION=/usr/bin/startlxde
|
||||
fi
|
||||
|
||||
+[ -f /etc/profile ] && . /etc/profile
|
||||
+[ -f ~/.profile ] && . ~/.profile
|
||||
[ -f /etc/xprofile ] && . /etc/xprofile
|
||||
[ -f ~/.xprofile ] && . ~/.xprofile
|
||||
60
srcpkgs/lxdm/patches/default-config.patch
Normal file
60
srcpkgs/lxdm/patches/default-config.patch
Normal file
|
|
@ -0,0 +1,60 @@
|
|||
diff -Naur lxdm.orig/data/lxdm.conf.in lxdm/data/lxdm.conf.in
|
||||
--- lxdm.orig/data/lxdm.conf.in 2013-08-30 17:56:16.097006000 +0200
|
||||
+++ lxdm/data/lxdm.conf.in 2013-09-04 01:54:12.942117085 +0200
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
[server]
|
||||
## arg used to start xserver, not fully function
|
||||
-# arg=/usr/bin/X -background vt1
|
||||
+arg=/usr/bin/X -background vt1
|
||||
# uncomment this if you really want xserver listen to tcp
|
||||
# tcp_listen=1
|
||||
# uncoment this if you want reset the xserver after logou
|
||||
@@ -34,7 +34,7 @@
|
||||
gtk_theme=Clearlooks
|
||||
|
||||
## background of the greeter
|
||||
-bg=/usr/share/backgrounds/default.png
|
||||
+bg=/usr/share/void-artwork/splash.png
|
||||
|
||||
## if show bottom pane
|
||||
bottom_pane=1
|
||||
diff -Naur lxdm.orig/data/lxdm.in lxdm/data/lxdm.in
|
||||
--- lxdm.orig/data/lxdm.in 2013-08-30 17:56:16.097006000 +0200
|
||||
+++ lxdm/data/lxdm.in 2013-09-04 01:57:56.950799946 +0200
|
||||
@@ -1,21 +1,13 @@
|
||||
#!/bin/sh
|
||||
|
||||
-[ -f /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n
|
||||
-
|
||||
-if [ -z "$LANG" -a -e /etc/sysconfig/language ]; then
|
||||
- . /etc/sysconfig/language
|
||||
- if [ -n "$RC_LANG"]; then
|
||||
- LANG=$RC_LANG
|
||||
- fi
|
||||
+if [ -r /etc/profile.d/locale.sh ]; then
|
||||
+ . /etc/profile.d/locale.sh
|
||||
fi
|
||||
|
||||
if [ -n "$LANG" ]; then
|
||||
export LANG
|
||||
fi
|
||||
|
||||
-[ -f /etc/sysconfig/desktop ] && . /etc/sysconfig/desktop
|
||||
-[ -f /etc/sysconfig/windowmanager ] && . /etc/sysconfig/windowmanager
|
||||
-
|
||||
if [ -n "$DEFAULT_WM" ]; then
|
||||
PREFERRED=$DEFAULT_WM
|
||||
fi
|
||||
diff -Naur lxdm.orig/data/Xsession lxdm/data/Xsession
|
||||
--- lxdm.orig/data/Xsession 2013-08-30 17:56:16.097006000 +0200
|
||||
+++ lxdm/data/Xsession 2013-09-04 01:58:19.941348762 +0200
|
||||
@@ -9,6 +9,8 @@
|
||||
LXSESSION=/usr/bin/startlxde
|
||||
fi
|
||||
|
||||
+[ -f /etc/profile ] && . /etc/profile
|
||||
+[ -f ~/.profile ] && . ~/.profile
|
||||
[ -f /etc/xprofile ] && . /etc/xprofile
|
||||
[ -f ~/.xprofile ] && . ~/.xprofile
|
||||
|
||||
3702
srcpkgs/lxdm/patches/git-fixes.patch
Normal file
3702
srcpkgs/lxdm/patches/git-fixes.patch
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -1,21 +0,0 @@
|
|||
From: dgod <dgod.osa@gmail.com>
|
||||
Date: Sun, 25 Dec 2011 07:23:19 +0000 (+0800)
|
||||
Subject: fix event check bug caused cpu 100%
|
||||
X-Git-Url: http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde%2Flxdm;a=commitdiff_plain;h=d4e41ecb;hp=f0951bdf736026b041001e846d2cb93f7f2852e1
|
||||
|
||||
fix event check bug caused cpu 100%
|
||||
---
|
||||
|
||||
diff --git a/src/lxcom.c b/src/lxcom.c
|
||||
index 02763eb..18ee12e 100644
|
||||
--- src/lxcom.c
|
||||
+++ src/lxcom.c
|
||||
@@ -89,7 +89,7 @@ static gboolean lxcom_prepare (GSource *source,gint *timeout)
|
||||
|
||||
static gboolean lxcom_check(GSource *source)
|
||||
{
|
||||
- return TRUE;
|
||||
+ return (((LXComSource*)source)->poll.revents&G_IO_IN)?TRUE:FALSE;
|
||||
}
|
||||
|
||||
static gboolean lxcom_dispatch (GSource *source,GSourceFunc callback,gpointer user_data)
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
--- data/lxdm.conf.in.orig 2012-05-02 10:53:30.903273165 +0200
|
||||
+++ data/lxdm.conf.in 2012-05-02 10:54:15.357223046 +0200
|
||||
@@ -16,7 +16,7 @@
|
||||
# xauth_path=/tmp
|
||||
|
||||
## greeter used to welcome the user
|
||||
-greeter=@FULL_LIBEXECDIR@/lxdm-greeter-gtk
|
||||
+greeter=/usr/libexec/lxdm-greeter-gtk
|
||||
|
||||
[server]
|
||||
## arg used to start xserver, not fully function
|
||||
@@ -27,7 +27,7 @@ greeter=@FULL_LIBEXECDIR@/lxdm-greeter-g
|
||||
gtk_theme=Clearlooks
|
||||
|
||||
## background of the greeter
|
||||
-bg=/usr/share/backgrounds/default.png
|
||||
+bg=/usr/share/void-artwork/splash.png
|
||||
|
||||
## if show bottom pane
|
||||
bottom_pane=1
|
||||
@@ -36,7 +36,7 @@ bottom_pane=1
|
||||
lang=1
|
||||
|
||||
## if show keyboard layout select control
|
||||
-keyboard=0
|
||||
+keyboard=0
|
||||
|
||||
## the theme of greeter
|
||||
theme=Industrial
|
||||
2
srcpkgs/lxdm/patches/series
Normal file
2
srcpkgs/lxdm/patches/series
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
git-fixes.patch
|
||||
default-config.patch
|
||||
|
|
@ -1,28 +1,30 @@
|
|||
# Template file for 'lxdm'
|
||||
pkgname=lxdm
|
||||
version=0.4.1
|
||||
revision=6
|
||||
revision=7
|
||||
patch_args="-Np1"
|
||||
build_style=gnu-configure
|
||||
configure_args="-with-xconn=xcb"
|
||||
hostmakedepends="pkg-config intltool"
|
||||
makedepends="gtk+-devel iso-codes"
|
||||
configure_args="--with-pam"
|
||||
hostmakedepends="pkg-config intltool automake libtool gettext-devel"
|
||||
makedepends="pam-devel gtk+-devel systemd-devel iso-codes"
|
||||
short_desc="GUI login manager for LXDE"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
license="GPL-3"
|
||||
homepage="http://www.lxde.org"
|
||||
distfiles="${SOURCEFORGE_SITE}/lxde/$pkgname-$version.tar.gz"
|
||||
checksum=9e0d0a5672fcf31a18de8178ce73eab1723d6ae7097dfe41e9fe2c46e180cf08
|
||||
long_desc="
|
||||
A lightweight dropped-in replacement for GDM or KDM."
|
||||
|
||||
pre_configure() {
|
||||
autoreconf -fi
|
||||
}
|
||||
|
||||
post_install() {
|
||||
# Remove useless script.
|
||||
rm -f ${DESTDIR}/usr/sbin/lxdm
|
||||
# Use our own pam file.
|
||||
rm -f ${DESTDIR}/etc/pam.d/lxdm
|
||||
vinstall ${FILESDIR}/lxdm.pam 644 etc/pam.d lxdm
|
||||
# Install systemd service.
|
||||
vinstall ${FILESDIR}/lxdm.service 644 usr/lib/systemd/system
|
||||
|
||||
vmkdir var/lib/lxdm
|
||||
echo 'GDK_CORE_DEVICE_EVENTS=true' > ${DESTDIR}/var/lib/lxdm/.pam_environment
|
||||
}
|
||||
|
||||
lxdm_package() {
|
||||
|
|
@ -40,7 +42,6 @@ lxdm_package() {
|
|||
system_groups="lxdm"
|
||||
systemd_services="lxdm.service off"
|
||||
pkg_install() {
|
||||
vmove etc
|
||||
vmove usr
|
||||
vmove all
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'shadow'
|
||||
pkgname=shadow
|
||||
version=4.1.5.1
|
||||
revision=13
|
||||
revision=14
|
||||
build_style=gnu-configure
|
||||
configure_args="--bindir=/usr/bin --sbindir=/usr/sbin
|
||||
--libdir=/usr/lib --enable-shared --disable-static
|
||||
|
|
@ -14,23 +14,21 @@ homepage="http://pkg-shadow.alioth.debian.org"
|
|||
distfiles="$homepage/releases/$pkgname-$version.tar.bz2"
|
||||
checksum=aa32333748d68b58ed3a83625f0165e0f6b9dc4639e6377c9300c6bf4fe978fb
|
||||
|
||||
# Build PIE binaries by default.
|
||||
CFLAGS="-fPIE"
|
||||
LDFLAGS="-pie"
|
||||
|
||||
if [ "$CROSS_BUILD" ]; then
|
||||
hostmakedepends="automake gettext-devel"
|
||||
hostmakedepends="automake libtool gettext-devel"
|
||||
pre_configure() {
|
||||
autoreconf -fi
|
||||
}
|
||||
fi
|
||||
|
||||
pre_build() {
|
||||
# Don't install the groups cmd, we use the one from coreutils.
|
||||
do_build() {
|
||||
# Don't install groups(1), we use the one from coreutils.
|
||||
sed -i 's/groups$(EXEEXT) //' src/Makefile
|
||||
for f in $(find man -name Makefile); do
|
||||
sed -i 's/groups\.1 / /' $f
|
||||
done
|
||||
# Build PIE binaries by default.
|
||||
make CFLAGS+=" -fPIE" LDFLAGS+=" -pie" ${makejobs}
|
||||
}
|
||||
|
||||
post_install() {
|
||||
|
|
@ -61,7 +59,7 @@ post_install() {
|
|||
rm \
|
||||
$DESTDIR/usr/bin/{chsh,chfn,sg} \
|
||||
$DESTDIR/usr/bin/{newgrp,login,su} \
|
||||
$DESTDIR/usr/sbin/{logoutd,vipw,vigr}
|
||||
$DESTDIR/usr/sbin/{nologin,logoutd,vipw,vigr}
|
||||
|
||||
# ...and their many man pages
|
||||
find $DESTDIR/usr/share/man \
|
||||
|
|
@ -72,6 +70,7 @@ post_install() {
|
|||
-name 'vipw.8' -o \
|
||||
-name 'vigr.8' -o \
|
||||
-name 'logoutd.8' -o \
|
||||
-name 'nologin.8' -o \
|
||||
-name 'newgrp.1' ')' \
|
||||
-delete
|
||||
|
||||
|
|
@ -97,7 +96,6 @@ shadow_package() {
|
|||
/etc/login.defs"
|
||||
depends="pam"
|
||||
pkg_install() {
|
||||
vmove etc
|
||||
vmove usr
|
||||
vmove all
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,3 +8,4 @@ session required pam_limits.so
|
|||
session required pam_unix.so
|
||||
session optional pam_loginuid.so
|
||||
session optional pam_systemd.so
|
||||
-session optional pam_gnome_keyring.so auto_start
|
||||
|
|
|
|||
28
srcpkgs/slim/patches/slim-1.3.6-add-sessiondir.patch
Normal file
28
srcpkgs/slim/patches/slim-1.3.6-add-sessiondir.patch
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
From 741e43960a4ea3a8bc230b1f599311d800c2cc83 Mon Sep 17 00:00:00 2001
|
||||
From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
|
||||
Date: Wed, 02 Oct 2013 23:23:24 +0000
|
||||
Subject: Update slim.conf. Add sessiondir.
|
||||
|
||||
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
|
||||
---
|
||||
diff --git a/slim.conf b/slim.conf
|
||||
index a8e2e1c..c5f1d38 100644
|
||||
--- slim.conf
|
||||
+++ slim.conf
|
||||
@@ -47,11 +47,9 @@ login_cmd exec /bin/bash -login ~/.xinitrc %session
|
||||
# options "-d" and "-nodaemon"
|
||||
# daemon yes
|
||||
|
||||
-# Available sessions (first one is the default).
|
||||
-# The current chosen session name is replaced in the login_cmd
|
||||
-# above, so your login command can handle different sessions.
|
||||
-# see the xinitrc.sample file shipped with slim sources
|
||||
-sessions xfce4,icewm-session,wmaker,blackbox
|
||||
+# Set directory that contains the xsessions.
|
||||
+# slim reads xsesion from this directory, and be able to select.
|
||||
+sessiondir /usr/share/xsessions/
|
||||
|
||||
# Executed when pressing F11 (requires imagemagick)
|
||||
screenshot_cmd import -window root /slim.png
|
||||
--
|
||||
cgit v0.9.2
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'slim'
|
||||
pkgname=slim
|
||||
version=1.3.6
|
||||
revision=1
|
||||
revision=2
|
||||
build_style=cmake
|
||||
configure_args="-DUSE_PAM=yes -DUSE_CONSOLEKIT=no"
|
||||
hostmakedepends="cmake pkg-config"
|
||||
|
|
@ -19,10 +19,13 @@ pre_configure() {
|
|||
|
||||
post_install() {
|
||||
vinstall ${FILESDIR}/slim.pam 644 etc/pam.d slim
|
||||
sed -e 's|#xserver_arguments.*|xserver_arguments -nolisten tcp vt01|' \
|
||||
-e 's|/var/run/slim.lock|/var/lock/slim.lock|' -i ${DESTDIR}/etc/slim.conf
|
||||
}
|
||||
|
||||
slim_package() {
|
||||
conf_files="/etc/slim.conf /etc/pam.d/slim"
|
||||
systemd_services="slim.service off"
|
||||
pkg_install() {
|
||||
vmove all
|
||||
}
|
||||
|
|
|
|||
28
srcpkgs/udevil/template
Normal file
28
srcpkgs/udevil/template
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
# Template file for 'udevil'
|
||||
pkgname=udevil
|
||||
version=0.4.1
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
hostmakedepends="pkg-config intltool"
|
||||
makedepends="libglib-devel libudev-devel"
|
||||
short_desc="CLI which mounts and unmounts removable devices without a password"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
license="GPL-3"
|
||||
homepage="http://ignorantguru.github.io/udevil/"
|
||||
distfiles="https://raw.github.com/IgnorantGuru/$pkgname/master/packages/$version/$pkgname-$version.tar.xz"
|
||||
checksum=fa4a3d85361d17bb69dd7dabdcfeecd2b0f5fff95698113975d8fbd504af6c2e
|
||||
|
||||
post_install() {
|
||||
# Drop useless conf.d/devmon file.
|
||||
rm -rf ${DESTDIR}/etc/conf.d
|
||||
sed -e '/EnvironmentFile.*/d' -i ${DESTDIR}/usr/lib/systemd/system/devmon@.service
|
||||
# make udevil setuid.
|
||||
chmod 4755 ${DESTDIR}/usr/bin/udevil
|
||||
}
|
||||
|
||||
udevil_package() {
|
||||
conf_files="/etc/udevil/udevil.conf"
|
||||
pkg_install() {
|
||||
vmove all
|
||||
}
|
||||
}
|
||||
|
|
@ -1,12 +1,10 @@
|
|||
[Unit]
|
||||
Description=Disk Manager
|
||||
After=syslog.target
|
||||
|
||||
[Service]
|
||||
Type=dbus
|
||||
BusName=org.freedesktop.UDisks
|
||||
ExecStart=/usr/libexec/udisks-daemon
|
||||
StandardOutput=syslog
|
||||
|
||||
[Install]
|
||||
WantedBy=graphical.target
|
||||
|
|
|
|||
28
srcpkgs/udisks/patches/drop-pci-db.patch
Normal file
28
srcpkgs/udisks/patches/drop-pci-db.patch
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
commit c73b5ab54378ec6d7df9948c46ce87f98587af9a
|
||||
Author: Tom Gundersen <teg@jklm.no>
|
||||
Date: 2 days ago
|
||||
|
||||
udev: remove redundant call to deprecated pci-db
|
||||
|
||||
The binary is no longer shipped with systemd/udev. The functionality
|
||||
is taken over by a builtin, which is ran for all devices, rendering
|
||||
this rule superfluous.
|
||||
|
||||
Cc: Jan de Groot <jgc@archlinux.org>
|
||||
Signed-off-by: Tom Gundersen <teg@jklm.no>
|
||||
|
||||
diff --git a/data/80-udisks.rules b/data/80-udisks.rules
|
||||
index d1c8c5d..4bf2b37 100644
|
||||
--- data/80-udisks.rules
|
||||
+++ data/80-udisks.rules
|
||||
@@ -1,10 +1,6 @@
|
||||
# Do not edit this file, it will be overwritten on updates
|
||||
#
|
||||
|
||||
-# import names for PCI storage controllers
|
||||
-#
|
||||
-SUBSYSTEM=="pci", ACTION=="add|change", ENV{ID_MODEL_FROM_DATABASE}=="", ATTR{class}=="0x01*", IMPORT{program}="pci-db %p"
|
||||
-
|
||||
# Set eSATA port type for known eSATA CardBus adapters - first we want to ensure
|
||||
# the device is on a cardbus controller (upper PCI device) - then we check
|
||||
# vid/pid (lower PCI device)
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
# Template file for 'udisks'
|
||||
pkgname=udisks
|
||||
version=1.0.4
|
||||
revision=11
|
||||
revision=12
|
||||
build_style=gnu-configure
|
||||
configure_args="--disable-static --enable-lvm2"
|
||||
hostmakedepends="pkg-config intltool libxslt docbook-xsl"
|
||||
makedepends="glib-devel device-mapper-devel
|
||||
hostmakedepends="pkg-config intltool libxslt docbook-xsl glib-devel"
|
||||
makedepends="libglib-devel device-mapper-devel
|
||||
liblvm2app-devel libparted-devel libatasmart-devel polkit-devel
|
||||
dbus-glib-devel libgudev-devel>=183 sg3_utils-devel"
|
||||
short_desc="Disk Management Service"
|
||||
|
|
@ -35,6 +35,9 @@ post_install() {
|
|||
vmkdir usr/share/bash-completion/completions
|
||||
mv ${DESTDIR}/etc/profile.d/udisks-bash-completion.sh \
|
||||
${DESTDIR}/usr/share/bash-completion/completions/udisks
|
||||
|
||||
echo "SystemdService=udisks.service" \
|
||||
>> ${DESTDIR}/usr/share/dbus-1/system-services/org.freedesktop.UDisks.service
|
||||
}
|
||||
|
||||
udisks_package() {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'util-linux'
|
||||
pkgname=util-linux
|
||||
version=2.24
|
||||
revision=1
|
||||
revision=2
|
||||
short_desc="Miscellaneous linux utilities"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
homepage="http://userweb.kernel.org/~kzak/util-linux-ng"
|
||||
|
|
@ -111,6 +111,8 @@ libuuid-devel_package() {
|
|||
}
|
||||
|
||||
util-linux_package() {
|
||||
# nologin(8)
|
||||
conflicts="shadow<4.1.5.1_14"
|
||||
# Create uuidd system account for uuidd.
|
||||
system_accounts="uuidd"
|
||||
uuidd_homedir="/run/uuidd"
|
||||
|
|
|
|||
21
srcpkgs/xfce4-dev-tools/template
Normal file
21
srcpkgs/xfce4-dev-tools/template
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
# Template file for 'xfce4-dev-tools'
|
||||
pkgname=xfce4-dev-tools
|
||||
version=4.10.0
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
hostmakedepends="automake libtool gtk-doc intltool pkg-config"
|
||||
makedepends="libglib-devel"
|
||||
short_desc="Xfce developer tools"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
license="GPL-2"
|
||||
homepage="http://xfce.org"
|
||||
distfiles="http://archive.se.xfce.org/src/xfce/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
|
||||
checksum=f79649bbfbbf16881494ee9f67035063765aec12e23ab9bac31de2c8a4f32bf8
|
||||
|
||||
xfce4-dev-tools_package() {
|
||||
depends="${hostmakedepends}"
|
||||
noarch=yes
|
||||
pkg_install() {
|
||||
vmove all
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,275 @@
|
|||
From b076b5592579b397b7d4888eb8062e646b9a4dec Mon Sep 17 00:00:00 2001
|
||||
From: Mikhail Efremov <sem@altlinux.org>
|
||||
Date: Wed, 10 Apr 2013 17:10:09 +0400
|
||||
Subject: [PATCH] Add systemd-logind support for suspend/hibernate.
|
||||
|
||||
---
|
||||
xfce4-session/Makefile.am | 8 +++----
|
||||
xfce4-session/xfsm-shutdown.c | 42 +++++++++++++++++++++++++++-------
|
||||
xfce4-session/xfsm-systemd.c | 52 +++++++++++++++++++++++++++++++++++++++++++
|
||||
xfce4-session/xfsm-systemd.h | 14 ++++++++++++
|
||||
4 files changed, 104 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/xfce4-session/Makefile.am b/xfce4-session/Makefile.am
|
||||
index 5472b33..5e2973b 100644
|
||||
--- xfce4-session/Makefile.am
|
||||
+++ xfce4-session/Makefile.am
|
||||
@@ -59,9 +59,7 @@ xfce4_session_SOURCES = \
|
||||
xfsm-splash-screen.c \
|
||||
xfsm-splash-screen.h \
|
||||
xfsm-startup.c \
|
||||
- xfsm-startup.h \
|
||||
- xfsm-upower.c \
|
||||
- xfsm-upower.h
|
||||
+ xfsm-startup.h
|
||||
|
||||
if HAVE_SYSTEMD
|
||||
xfce4_session_SOURCES += \
|
||||
@@ -70,7 +68,9 @@ xfce4_session_SOURCES += \
|
||||
else
|
||||
xfce4_session_SOURCES += \
|
||||
xfsm-consolekit.c \
|
||||
- xfsm-consolekit.h
|
||||
+ xfsm-consolekit.h \
|
||||
+ xfsm-upower.c \
|
||||
+ xfsm-upower.h
|
||||
endif
|
||||
|
||||
xfce4_session_CFLAGS = \
|
||||
diff --git a/xfce4-session/xfsm-shutdown.c b/xfce4-session/xfsm-shutdown.c
|
||||
index 4c483a7..8a2ba8d 100644
|
||||
--- xfce4-session/xfsm-shutdown.c
|
||||
+++ xfce4-session/xfsm-shutdown.c
|
||||
@@ -66,12 +66,12 @@
|
||||
#include <xfce4-session/xfsm-fadeout.h>
|
||||
#include <xfce4-session/xfsm-global.h>
|
||||
#include <xfce4-session/xfsm-legacy.h>
|
||||
-#include <xfce4-session/xfsm-upower.h>
|
||||
|
||||
#ifdef HAVE_SYSTEMD
|
||||
#include <xfce4-session/xfsm-systemd.h>
|
||||
#else
|
||||
#include <xfce4-session/xfsm-consolekit.h>
|
||||
+#include <xfce4-session/xfsm-upower.h>
|
||||
#endif
|
||||
|
||||
static void xfsm_shutdown_finalize (GObject *object);
|
||||
@@ -100,8 +100,8 @@ struct _XfsmShutdown
|
||||
XfsmSystemd *systemd;
|
||||
#else
|
||||
XfsmConsolekit *consolekit;
|
||||
-#endif
|
||||
XfsmUPower *upower;
|
||||
+#endif
|
||||
|
||||
/* kiosk settings */
|
||||
gboolean kiosk_can_shutdown;
|
||||
@@ -142,8 +142,8 @@ xfsm_shutdown_init (XfsmShutdown *shutdown)
|
||||
shutdown->systemd = xfsm_systemd_get ();
|
||||
#else
|
||||
shutdown->consolekit = xfsm_consolekit_get ();
|
||||
-#endif
|
||||
shutdown->upower = xfsm_upower_get ();
|
||||
+#endif
|
||||
shutdown->helper_state = SUDO_NOT_INITIAZED;
|
||||
shutdown->helper_require_password = FALSE;
|
||||
|
||||
@@ -165,8 +165,8 @@ xfsm_shutdown_finalize (GObject *object)
|
||||
g_object_unref (G_OBJECT (shutdown->systemd));
|
||||
#else
|
||||
g_object_unref (G_OBJECT (shutdown->consolekit));
|
||||
-#endif
|
||||
g_object_unref (G_OBJECT (shutdown->upower));
|
||||
+#endif
|
||||
|
||||
/* close down helper */
|
||||
xfsm_shutdown_sudo_free (shutdown);
|
||||
@@ -692,7 +692,11 @@ xfsm_shutdown_try_suspend (XfsmShutdown *shutdown,
|
||||
{
|
||||
g_return_val_if_fail (XFSM_IS_SHUTDOWN (shutdown), FALSE);
|
||||
|
||||
+#ifdef HAVE_SYSTEMD
|
||||
+ return xfsm_systemd_try_suspend (shutdown->systemd, error);
|
||||
+#else
|
||||
return xfsm_upower_try_suspend (shutdown->upower, error);
|
||||
+#endif
|
||||
}
|
||||
|
||||
|
||||
@@ -703,7 +707,11 @@ xfsm_shutdown_try_hibernate (XfsmShutdown *shutdown,
|
||||
{
|
||||
g_return_val_if_fail (XFSM_IS_SHUTDOWN (shutdown), FALSE);
|
||||
|
||||
+#ifdef HAVE_SYSTEMD
|
||||
+ return xfsm_systemd_try_hibernate (shutdown->systemd, error);
|
||||
+#else
|
||||
return xfsm_upower_try_hibernate (shutdown->upower, error);
|
||||
+#endif
|
||||
}
|
||||
|
||||
|
||||
@@ -776,6 +784,8 @@ xfsm_shutdown_can_suspend (XfsmShutdown *shutdown,
|
||||
gboolean *auth_suspend,
|
||||
GError **error)
|
||||
{
|
||||
+ gboolean ret;
|
||||
+
|
||||
g_return_val_if_fail (XFSM_IS_SHUTDOWN (shutdown), FALSE);
|
||||
|
||||
if (!xfsm_shutdown_kiosk_can_shutdown (shutdown, NULL))
|
||||
@@ -784,8 +794,15 @@ xfsm_shutdown_can_suspend (XfsmShutdown *shutdown,
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
- return xfsm_upower_can_suspend (shutdown->upower, can_suspend,
|
||||
- auth_suspend, error);
|
||||
+#ifdef HAVE_SYSTEMD
|
||||
+ ret = xfsm_systemd_can_suspend (shutdown->systemd, can_suspend, error);
|
||||
+ *auth_suspend = *can_suspend;
|
||||
+#else
|
||||
+ ret = xfsm_upower_can_suspend (shutdown->upower, can_suspend,
|
||||
+ auth_suspend, error);
|
||||
+#endif
|
||||
+
|
||||
+ return ret;
|
||||
}
|
||||
|
||||
|
||||
@@ -796,6 +813,8 @@ xfsm_shutdown_can_hibernate (XfsmShutdown *shutdown,
|
||||
gboolean *auth_hibernate,
|
||||
GError **error)
|
||||
{
|
||||
+ gboolean ret;
|
||||
+
|
||||
g_return_val_if_fail (XFSM_IS_SHUTDOWN (shutdown), FALSE);
|
||||
|
||||
if (!xfsm_shutdown_kiosk_can_shutdown (shutdown, NULL))
|
||||
@@ -804,8 +823,15 @@ xfsm_shutdown_can_hibernate (XfsmShutdown *shutdown,
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
- return xfsm_upower_can_hibernate (shutdown->upower, can_hibernate,
|
||||
- auth_hibernate, error);
|
||||
+#ifdef HAVE_SYSTEMD
|
||||
+ ret = xfsm_systemd_can_hibernate (shutdown->systemd, can_hibernate, error);
|
||||
+ *auth_hibernate = *can_hibernate;
|
||||
+#else
|
||||
+ ret = xfsm_upower_can_hibernate (shutdown->upower, can_hibernate,
|
||||
+ auth_hibernate, error);
|
||||
+#endif
|
||||
+
|
||||
+ return ret;
|
||||
}
|
||||
|
||||
|
||||
diff --git a/xfce4-session/xfsm-systemd.c b/xfce4-session/xfsm-systemd.c
|
||||
index 7bdd39d..cfe7bf4 100644
|
||||
--- xfce4-session/xfsm-systemd.c
|
||||
+++ xfce4-session/xfsm-systemd.c
|
||||
@@ -33,8 +33,12 @@
|
||||
#define SYSTEMD_DBUS_INTERFACE "org.freedesktop.login1.Manager"
|
||||
#define SYSTEMD_REBOOT_ACTION "Reboot"
|
||||
#define SYSTEMD_POWEROFF_ACTION "PowerOff"
|
||||
+#define SYSTEMD_SUSPEND_ACTION "Suspend"
|
||||
+#define SYSTEMD_HIBERNATE_ACTION "Hibernate"
|
||||
#define SYSTEMD_REBOOT_TEST "org.freedesktop.login1.reboot"
|
||||
#define SYSTEMD_POWEROFF_TEST "org.freedesktop.login1.power-off"
|
||||
+#define SYSTEMD_SUSPEND_TEST "org.freedesktop.login1.suspend"
|
||||
+#define SYSTEMD_HIBERNATE_TEST "org.freedesktop.login1.hibernate"
|
||||
|
||||
|
||||
|
||||
@@ -205,6 +209,28 @@ xfsm_systemd_try_shutdown (XfsmSystemd *systemd,
|
||||
|
||||
|
||||
gboolean
|
||||
+xfsm_systemd_try_suspend (XfsmSystemd *systemd,
|
||||
+ GError **error)
|
||||
+{
|
||||
+ return xfsm_systemd_try_method (systemd,
|
||||
+ SYSTEMD_SUSPEND_ACTION,
|
||||
+ error);
|
||||
+}
|
||||
+
|
||||
+
|
||||
+
|
||||
+gboolean
|
||||
+xfsm_systemd_try_hibernate (XfsmSystemd *systemd,
|
||||
+ GError **error)
|
||||
+{
|
||||
+ return xfsm_systemd_try_method (systemd,
|
||||
+ SYSTEMD_HIBERNATE_ACTION,
|
||||
+ error);
|
||||
+}
|
||||
+
|
||||
+
|
||||
+
|
||||
+gboolean
|
||||
xfsm_systemd_can_restart (XfsmSystemd *systemd,
|
||||
gboolean *can_restart,
|
||||
GError **error)
|
||||
@@ -227,3 +253,29 @@ xfsm_systemd_can_shutdown (XfsmSystemd *systemd,
|
||||
SYSTEMD_POWEROFF_TEST,
|
||||
error);
|
||||
}
|
||||
+
|
||||
+
|
||||
+
|
||||
+gboolean
|
||||
+xfsm_systemd_can_suspend (XfsmSystemd *systemd,
|
||||
+ gboolean *can_suspend,
|
||||
+ GError **error)
|
||||
+{
|
||||
+ return xfsm_systemd_can_method (systemd,
|
||||
+ can_suspend,
|
||||
+ SYSTEMD_SUSPEND_TEST,
|
||||
+ error);
|
||||
+}
|
||||
+
|
||||
+
|
||||
+
|
||||
+gboolean
|
||||
+xfsm_systemd_can_hibernate (XfsmSystemd *systemd,
|
||||
+ gboolean *can_hibernate,
|
||||
+ GError **error)
|
||||
+{
|
||||
+ return xfsm_systemd_can_method (systemd,
|
||||
+ can_hibernate,
|
||||
+ SYSTEMD_HIBERNATE_TEST,
|
||||
+ error);
|
||||
+}
|
||||
diff --git a/xfce4-session/xfsm-systemd.h b/xfce4-session/xfsm-systemd.h
|
||||
index 8223622..6cf803f 100644
|
||||
--- xfce4-session/xfsm-systemd.h
|
||||
+++ xfce4-session/xfsm-systemd.h
|
||||
@@ -42,6 +42,12 @@ gboolean xfsm_systemd_try_restart (XfsmSystemd *systemd,
|
||||
gboolean xfsm_systemd_try_shutdown (XfsmSystemd *systemd,
|
||||
GError **error);
|
||||
|
||||
+gboolean xfsm_systemd_try_suspend (XfsmSystemd *systemd,
|
||||
+ GError **error);
|
||||
+
|
||||
+gboolean xfsm_systemd_try_hibernate (XfsmSystemd *systemd,
|
||||
+ GError **error);
|
||||
+
|
||||
gboolean xfsm_systemd_can_restart (XfsmSystemd *systemd,
|
||||
gboolean *can_restart,
|
||||
GError **error);
|
||||
@@ -50,6 +56,14 @@ gboolean xfsm_systemd_can_shutdown (XfsmSystemd *systemd,
|
||||
gboolean *can_shutdown,
|
||||
GError **error);
|
||||
|
||||
+gboolean xfsm_systemd_can_suspend (XfsmSystemd *systemd,
|
||||
+ gboolean *can_suspend,
|
||||
+ GError **error);
|
||||
+
|
||||
+gboolean xfsm_systemd_can_hibernate (XfsmSystemd *systemd,
|
||||
+ gboolean *can_hibernate,
|
||||
+ GError **error);
|
||||
+
|
||||
G_END_DECLS
|
||||
|
||||
#endif /* __XFSM_SYSTEMD_H__ */
|
||||
--
|
||||
1.8.1.5
|
||||
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
# Template file for 'xfce4-session'
|
||||
pkgname=xfce4-session
|
||||
version=4.10.1
|
||||
revision=1
|
||||
revision=2
|
||||
build_style=gnu-configure
|
||||
configure_args="--disable-static --enable-systemd"
|
||||
hostmakedepends="pkg-config intltool"
|
||||
hostmakedepends="pkg-config intltool xfce4-dev-tools gettext-devel"
|
||||
makedepends="libxfce4ui-devel gtk+-devel xfconf-devel dbus-glib-devel
|
||||
libwnck2-devel xfce4-panel-devel systemd-devel polkit-devel desktop-file-utils
|
||||
libgnome-keyring-devel libSM-devel iceauth upower udisks hicolor-icon-theme"
|
||||
|
|
@ -15,17 +15,22 @@ homepage="http://xfce.org"
|
|||
distfiles="http://archive.se.xfce.org/src/xfce/xfce4-session/4.10/$pkgname-$version.tar.bz2"
|
||||
checksum=0154fabdc398798c3445374ccc52a2f5bcb2d867fc94bc54114395b24f9cfc83
|
||||
|
||||
pre_configure() {
|
||||
xdt-autogen
|
||||
}
|
||||
|
||||
xfce4-session-devel_package() {
|
||||
depends="libxfce4ui-devel xfconf-devel ${sourcepkg}>=${version}"
|
||||
depends="libxfce4ui-devel xfconf-devel ${sourcepkg}>=${version}_${revision}"
|
||||
short_desc+=" - development files"
|
||||
pkg_install() {
|
||||
vmove usr/include
|
||||
vmove usr/lib/pkgconfig
|
||||
vmove "usr/lib/*.so"
|
||||
}
|
||||
}
|
||||
|
||||
xfce4-session_package() {
|
||||
depends="upower udisks hicolor-icon-theme desktop-file-utils"
|
||||
depends="upower hicolor-icon-theme desktop-file-utils"
|
||||
conf_files="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml"
|
||||
pkg_install() {
|
||||
vmove all
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# Template build file for 'xorg-server'.
|
||||
pkgname=xorg-server
|
||||
version=1.14.3
|
||||
revision=2
|
||||
version=1.14.3.901
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--enable-ipv6 --enable-xcsecurity --enable-record
|
||||
--enable-xnest --enable-xephyr --enable-composite --enable-xvfb
|
||||
|
|
@ -17,7 +17,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
|
|||
homepage="http://xorg.freedesktop.org"
|
||||
license="MIT/X11, BSD"
|
||||
distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.bz2"
|
||||
checksum=02125ae13a443dcbb55f964d5c37f1da2f58ad54c2102356037bec23c1b84f5e
|
||||
checksum=3d8481f60d6ef67bb9b72c1ee375f5a64e69ba32c613c01367b3c2b5c154ab0a
|
||||
|
||||
hostmakedepends="pkg-config perl flex"
|
||||
makedepends="damageproto inputproto>=2.2 glproto>=1.4.15 xproto>=7.0.22
|
||||
|
|
|
|||
Loading…
Reference in a new issue