wok-next rev 19848
Add consolekit2 (hope we will find a way to drop it); up lxsession, gtk2-engine-murrine.
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Sun Aug 27 15:34:42 2017 +0300 (2017-08-27) |
| parents | 0d40dbf6ce97 |
| children | 2f19239eaed4 |
| files | consolekit2/receipt gtk2-engine-murrine/receipt lxsession/receipt lxsession/stuff/patches/0001-Use-GApplication-for-unique-app-handling.patch lxsession/stuff/patches/series |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/consolekit2/receipt Sun Aug 27 15:34:42 2017 +0300 1.3 @@ -0,0 +1,54 @@ 1.4 +# SliTaz package receipt v2. 1.5 + 1.6 +PACKAGE="consolekit2" 1.7 +VERSION="1.0.2" 1.8 +CATEGORY="system-tools" 1.9 +SHORT_DESC="ConsoleKit framework" 1.10 +MAINTAINER="al.bobylev@gmail.com" 1.11 +LICENSE="GPL2" 1.12 +WEB_SITE="https://github.com/Consolekit2/ConsoleKit2" 1.13 + 1.14 +TARBALL="ConsoleKit2-$VERSION.tar.bz2" 1.15 +WGET_URL="https://github.com/Consolekit2/ConsoleKit2/releases/download/$VERSION/$TARBALL" 1.16 + 1.17 +BUILD_DEPENDS="xorg-libX11-dev gettext dbus-dev glib-dev polkit-dev eudev-dev \ 1.18 +xmlto libxslt docbook-xsl" 1.19 +SPLIT="consolekit2-dev" 1.20 + 1.21 +# Rules to configure and make the package. 1.22 +compile_rules() 1.23 +{ 1.24 + # http://www.linuxfromscratch.org/blfs/view/stable/postlfs/consolekit.html 1.25 + 1.26 + ./configure \ 1.27 + --sysconfdir=/etc \ 1.28 + --localstatedir=/var \ 1.29 + --enable-udev-acl \ 1.30 + --enable-polkit \ 1.31 + --with-xinitrc-dir=/etc/X11/app-defaults/xinitrc.d \ 1.32 + --docdir=/usr/share/doc/ConsoleKit-$VERSION \ 1.33 + --with-systemdsystemunitdir=no \ 1.34 + --enable-docbook-docs \ 1.35 + $CONFIGURE_ARGS && 1.36 + make && make install && 1.37 + 1.38 + mv -v $install/etc/X11/app-defaults/xinitrc.d/90-consolekit \ 1.39 + $install/etc/X11/app-defaults/xinitrc.d/90-consolekit.sh 1.40 +} 1.41 + 1.42 +# Rules to gen a SliTaz package suitable for Tazpkg. 1.43 +genpkg_rules() 1.44 +{ 1.45 + case $PACKAGE in 1.46 + consolekit2) 1.47 + copy @std 1.48 + DEPENDS="acl attr dbus eudev glib libffi pcre polkit \ 1.49 + util-linux-blkid util-linux-mount util-linux-uuid xorg-libX11 \ 1.50 + xorg-libXau xorg-libXdmcp xorg-libxcb zlib" 1.51 + ;; 1.52 + *-dev) 1.53 + copy @dev 1.54 + DEPENDS="consolekit2 dbus-dev" 1.55 + ;; 1.56 + esac 1.57 +}
2.1 --- a/gtk2-engine-murrine/receipt Sun Aug 27 04:54:19 2017 +0300 2.2 +++ b/gtk2-engine-murrine/receipt Sun Aug 27 15:34:42 2017 +0300 2.3 @@ -1,4 +1,4 @@ 2.4 -# SliTaz package receipt. 2.5 +# SliTaz package receipt v2. 2.6 2.7 PACKAGE="gtk2-engine-murrine" 2.8 VERSION="0.98.2" 2.9 @@ -8,12 +8,11 @@ 2.10 LICENSE="LGPL3" 2.11 #WEB_SITE="http://www.cimitan.com/murrine" 2.12 WEB_SITE="http://ubuntuforums.org/showthread.php?t=239378" 2.13 + 2.14 TARBALL="murrine-$VERSION.tar.xz" 2.15 WGET_URL="$GNOME_MIRROR/murrine/${VERSION%.*}/$TARBALL" 2.16 -TAGS="gtk2" 2.17 2.18 -DEPENDS="gtk+" 2.19 -BUILD_DEPENDS="gtk+-dev libxml2-dev" 2.20 +BUILD_DEPENDS="gtk+-dev libxml2-dev intltool" 2.21 2.22 # Rules to configure and make the package. 2.23 compile_rules() 2.24 @@ -29,8 +28,7 @@ 2.25 # Rules to gen a SliTaz package suitable for Tazpkg. 2.26 genpkg_rules() 2.27 { 2.28 - mkdir -p $fs/usr 2.29 - cp -a $install/usr/lib $fs/usr 2.30 - cp -a $install/usr/share $fs/usr 2.31 - find $fs -name '*.la' -delete 2.32 + copy @std 2.33 + TAGS="gtk2" 2.34 + DEPENDS="gtk+" 2.35 }
3.1 --- a/lxsession/receipt Sun Aug 27 04:54:19 2017 +0300 3.2 +++ b/lxsession/receipt Sun Aug 27 15:34:42 2017 +0300 3.3 @@ -12,35 +12,40 @@ 3.4 TARBALL="$PACKAGE-$VERSION.tar.xz" 3.5 WGET_URL="$SF_MIRROR/lxde/$TARBALL" 3.6 3.7 -BUILD_DEPENDS="intltool xorg-libX11-dev libunique-dev polkit-dev vala libxslt \ 3.8 -docbook-xsl" 3.9 +BUILD_DEPENDS="intltool xorg-libX11-dev polkit-dev vala libxslt docbook-xsl \ 3.10 +automake gtk+-dev" 3.11 3.12 # Rules to configure and make the package. 3.13 compile_rules() 3.14 { 3.15 # http://www.linuxfromscratch.org/blfs/view/stable/lxde/lxsession.html 3.16 + 3.17 + # https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/lxsession 3.18 + # Regenerate C sources from Vala code 3.19 + rm *.stamp 3.20 + autoreconf -fi 3.21 + 3.22 # Additional keys: --enable-buildin-clipboard, --enable-buildin-polkit 3.23 ./configure \ 3.24 --sysconfdir=/etc \ 3.25 --enable-buildin-clipboard \ 3.26 - --enable-buildin-polkit \ 3.27 $CONFIGURE_ARGS && 3.28 - make && make install && 3.29 + make && make install || exit 1 3.30 3.31 # customize desktop.conf for SliTaz 3.32 - mkdir -p $install/etc/xdg/lxsession/LXDE/ && 3.33 - cp $src/data/desktop.conf.example $install/etc/xdg/lxsession/LXDE/desktop.conf && 3.34 + mkdir -p $install/etc/xdg/lxsession/LXDE/ 3.35 + cp $src/data/desktop.conf.example $install/etc/xdg/lxsession/LXDE/desktop.conf 3.36 sed -i ' 3.37 s|^\(terminal_manager/command\).*|\1=terminal|; 3.38 s|^\(launcher_manager/command\).*|\1=lxpanelctl|; 3.39 s|^\(window_manager\).*|\1=openbox|; 3.40 s|^#*\(iXft/Hinting\)|\1=1|; 3.41 - s|^\(sNet/ThemeName\).*|\1=Clearlooks Human|; 3.42 - s|^\(sNet/IconThemeName\).*|\1=SliTaz-Faenza-Dark|; 3.43 + s|^\(sNet/ThemeName\).*|\1=Paper|; 3.44 + s|^\(sNet/IconThemeName\).*|\1=SliTaz-Paper|; 3.45 s|^\(sGtk/FontName\).*|\1=DejaVu Sans 10|; 3.46 s|^#*\(iGtk/ToolbarIconSize\).*|\1=2|; 3.47 s|^#*\(sGtk/CursorThemeName\).*|\1=slitaz-polar|; 3.48 - ' $install/etc/xdg/lxsession/LXDE/desktop.conf && 3.49 + ' $install/etc/xdg/lxsession/LXDE/desktop.conf 3.50 3.51 # change icon 3.52 sed -i 's|^Icon=.*$|Icon=session-properties|' \ 3.53 @@ -51,7 +56,7 @@ 3.54 genpkg_rules() 3.55 { 3.56 copy @std 3.57 - DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk+ libunique \ 3.58 - pango polkit xorg-libX11 dbus-glib lsb-release" 3.59 + DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk+ pango polkit \ 3.60 + xorg-libX11 dbus-glib lsb-release" 3.61 PROVIDE="lxsession-edit" 3.62 }
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 4.2 +++ b/lxsession/stuff/patches/0001-Use-GApplication-for-unique-app-handling.patch Sun Aug 27 15:34:42 2017 +0300 4.3 @@ -0,0 +1,147 @@ 4.4 +From a7d3b40a79a7a16c1f5d50d2bd466570258dae29 Mon Sep 17 00:00:00 2001 4.5 +From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com> 4.6 +Date: Sun, 22 Jan 2017 01:09:59 +0100 4.7 +Subject: [PATCH] Use GApplication for unique app handling 4.8 + 4.9 +Remove libunique dependency, and use glib >= 2.28.0 to handle unique apps both for GTK+ 2 and 3. 4.10 +--- 4.11 + Makefile.am | 6 ------ 4.12 + configure.ac | 7 +------ 4.13 + lxclipboard/main.vala | 16 +--------------- 4.14 + lxpolkit/main.vala | 16 +--------------- 4.15 + 4 files changed, 3 insertions(+), 42 deletions(-) 4.16 + 4.17 +diff --git a/Makefile.am b/Makefile.am 4.18 +index c2e1fe8..e3a3b97 100644 4.19 +--- a/Makefile.am 4.20 ++++ b/Makefile.am 4.21 +@@ -90,9 +90,6 @@ if USE_GTK3 4.22 + lxclipboard_lxclipboard_VALAFLAGS += --define USE_GTK3 4.23 + else 4.24 + lxclipboard_lxclipboard_VALAFLAGS += --define USE_GTK2 4.25 +-lxclipboard_lxclipboard_VALAFLAGS += --pkg unique-1.0 4.26 +-lxclipboard_lxclipboard_CPPFLAGS += $(UNIQUE_CFLAGS) 4.27 +-lxclipboard_lxclipboard_LDADD += $(UNIQUE_LIBS) 4.28 + endif 4.29 + 4.30 + lxpolkit_lxpolkit_vala_SOURCES = \ 4.31 +@@ -137,9 +134,6 @@ if USE_GTK3 4.32 + lxpolkit_lxpolkit_VALAFLAGS += --define USE_GTK3 4.33 + else 4.34 + lxpolkit_lxpolkit_VALAFLAGS += --define USE_GTK2 4.35 +-lxpolkit_lxpolkit_VALAFLAGS += --pkg unique-1.0 4.36 +-lxpolkit_lxpolkit_CPPFLAGS += $(UNIQUE_CFLAGS) 4.37 +-lxpolkit_lxpolkit_LDADD += $(UNIQUE_LIBS) 4.38 + endif 4.39 + 4.40 + lxsession_db_lxsession_db_SOURCES = \ 4.41 +diff --git a/configure.ac b/configure.ac 4.42 +index 06ddbb3..9126f4d 100644 4.43 +--- a/configure.ac 4.44 ++++ b/configure.ac 4.45 +@@ -45,7 +45,7 @@ PKG_CHECK_MODULES(X11, [x11]) 4.46 + AC_SUBST(X11_CFLAGS) 4.47 + AC_SUBST(X11_LIBS) 4.48 + 4.49 +-PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.6.0]) 4.50 ++PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.28.0]) 4.51 + AC_SUBST(GLIB_CFLAGS) 4.52 + AC_SUBST(GLIB_LIBS) 4.53 + 4.54 +@@ -79,11 +79,6 @@ else 4.55 + CFLAGS="$CFLAGS -D USE_GTK2" 4.56 + gtk_modules="gtk+-2.0 >= 2.6.0" 4.57 + VALA_GTK_LIBS="gtk+-2.0" 4.58 +- 4.59 +- PKG_CHECK_MODULES(UNIQUE, [unique-1.0]) 4.60 +- AC_SUBST(UNIQUE_CFLAGS) 4.61 +- AC_SUBST(UNIQUE_LIBS) 4.62 +- 4.63 + fi 4.64 + PKG_CHECK_MODULES(GTK, [$gtk_modules]) 4.65 + AC_SUBST(GTK_CFLAGS) 4.66 +diff --git a/lxclipboard/main.vala b/lxclipboard/main.vala 4.67 +index bee4044..3d4a8d7 100644 4.68 +--- a/lxclipboard/main.vala 4.69 ++++ b/lxclipboard/main.vala 4.70 +@@ -17,9 +17,6 @@ 4.71 + * MA 02110-1301, USA. 4.72 + */ 4.73 + using Gtk; 4.74 +-#if USE_GTK2 4.75 +-using Unique; 4.76 +-#endif 4.77 + 4.78 + namespace Lxsession 4.79 + { 4.80 +@@ -28,17 +25,7 @@ namespace Lxsession 4.81 + public static int main(string[] args) 4.82 + { 4.83 + Gtk.init (ref args); 4.84 +-#if USE_GTK2 4.85 +- Unique.App app = new Unique.App("org.lxde.lxclipboard", null); 4.86 +- 4.87 +- if(app.is_running) 4.88 +- { 4.89 +- message("lxclipboard is already running. Existing"); 4.90 +- return 0; 4.91 +- } 4.92 +-#endif 4.93 +-# if USE_GTK3 4.94 +- Gtk.Application app = new Gtk.Application ( 4.95 ++ GLib.Application app = new GLib.Application ( 4.96 + "org.lxde.lxclipboard", 4.97 + GLib.ApplicationFlags.FLAGS_NONE); 4.98 + app.register (); 4.99 +@@ -48,7 +35,6 @@ namespace Lxsession 4.100 + message("lxclipboard is already running. Existing"); 4.101 + return 0; 4.102 + } 4.103 +-#endif 4.104 + 4.105 + clipboard_start (); 4.106 + 4.107 +diff --git a/lxpolkit/main.vala b/lxpolkit/main.vala 4.108 +index c0d6ae2..50c3cb7 100644 4.109 +--- a/lxpolkit/main.vala 4.110 ++++ b/lxpolkit/main.vala 4.111 +@@ -17,9 +17,6 @@ 4.112 + * MA 02110-1301, USA. 4.113 + */ 4.114 + using Gtk; 4.115 +-#if USE_GTK2 4.116 +-using Unique; 4.117 +-#endif 4.118 + 4.119 + const string GETTEXT_PACKAGE = "lxsession"; 4.120 + 4.121 +@@ -33,17 +30,7 @@ namespace Lxsession 4.122 + Intl.bind_textdomain_codeset(GETTEXT_PACKAGE, "utf-8"); 4.123 + 4.124 + Gtk.init (ref args); 4.125 +-#if USE_GTK2 4.126 +- Unique.App app = new Unique.App("org.lxde.lxpolkit", null); 4.127 +- 4.128 +- if(app.is_running) 4.129 +- { 4.130 +- message(_("lxpolkit is already running. Existing")); 4.131 +- return 0; 4.132 +- } 4.133 +-#endif 4.134 +-# if USE_GTK3 4.135 +- Gtk.Application app = new Gtk.Application ( 4.136 ++ GLib.Application app = new GLib.Application ( 4.137 + "org.lxde.lxpolkit", 4.138 + GLib.ApplicationFlags.FLAGS_NONE); 4.139 + app.register (); 4.140 +@@ -53,7 +40,6 @@ namespace Lxsession 4.141 + message(_("lxpolkit is already running. Existing")); 4.142 + return 0; 4.143 + } 4.144 +-#endif 4.145 + 4.146 + policykit_agent_init(); 4.147 + 4.148 +-- 4.149 +2.11.0 4.150 +