lxpanel: 5.8 -> 5.10
This commit is contained in:
parent
3c447278ec
commit
576ba8145d
@ -13,9 +13,11 @@ drwxr-xr-x root/root usr/lib/lxpanel/plugins/
|
|||||||
-rwxr-xr-x root/root usr/lib/lxpanel/plugins/cpufreq.so
|
-rwxr-xr-x root/root usr/lib/lxpanel/plugins/cpufreq.so
|
||||||
-rwxr-xr-x root/root usr/lib/lxpanel/plugins/deskno.so
|
-rwxr-xr-x root/root usr/lib/lxpanel/plugins/deskno.so
|
||||||
-rwxr-xr-x root/root usr/lib/lxpanel/plugins/kbled.so
|
-rwxr-xr-x root/root usr/lib/lxpanel/plugins/kbled.so
|
||||||
|
-rwxr-xr-x root/root usr/lib/lxpanel/plugins/monitors.so
|
||||||
-rwxr-xr-x root/root usr/lib/lxpanel/plugins/netstatus.so
|
-rwxr-xr-x root/root usr/lib/lxpanel/plugins/netstatus.so
|
||||||
-rwxr-xr-x root/root usr/lib/lxpanel/plugins/thermal.so
|
-rwxr-xr-x root/root usr/lib/lxpanel/plugins/thermal.so
|
||||||
-rwxr-xr-x root/root usr/lib/lxpanel/plugins/volumealsa.so
|
-rwxr-xr-x root/root usr/lib/lxpanel/plugins/volumealsa.so
|
||||||
|
-rwxr-xr-x root/root usr/lib/lxpanel/plugins/wnckpager.so
|
||||||
-rwxr-xr-x root/root usr/lib/lxpanel/plugins/xkb.so
|
-rwxr-xr-x root/root usr/lib/lxpanel/plugins/xkb.so
|
||||||
drwxr-xr-x root/root usr/lib/pkgconfig/
|
drwxr-xr-x root/root usr/lib/pkgconfig/
|
||||||
-rw-r--r-- root/root usr/lib/pkgconfig/lxpanel.pc
|
-rw-r--r-- root/root usr/lib/pkgconfig/lxpanel.pc
|
||||||
@ -57,7 +59,9 @@ drwxr-xr-x root/root usr/share/lxpanel/images/
|
|||||||
-rw-r--r-- root/root usr/share/lxpanel/images/scrllock-off.png
|
-rw-r--r-- root/root usr/share/lxpanel/images/scrllock-off.png
|
||||||
-rw-r--r-- root/root usr/share/lxpanel/images/scrllock-on.png
|
-rw-r--r-- root/root usr/share/lxpanel/images/scrllock-on.png
|
||||||
-rw-r--r-- root/root usr/share/lxpanel/images/stock_volume.png
|
-rw-r--r-- root/root usr/share/lxpanel/images/stock_volume.png
|
||||||
-rw-r--r-- root/root usr/share/lxpanel/images/volume.png
|
-rw-r--r-- root/root usr/share/lxpanel/images/volume-high.png
|
||||||
|
-rw-r--r-- root/root usr/share/lxpanel/images/volume-low.png
|
||||||
|
-rw-r--r-- root/root usr/share/lxpanel/images/volume-medium.png
|
||||||
-rw-r--r-- root/root usr/share/lxpanel/images/window-manager.png
|
-rw-r--r-- root/root usr/share/lxpanel/images/window-manager.png
|
||||||
drwxr-xr-x root/root usr/share/lxpanel/images/xkb-flags/
|
drwxr-xr-x root/root usr/share/lxpanel/images/xkb-flags/
|
||||||
-rw-r--r-- root/root usr/share/lxpanel/images/xkb-flags/ae.png
|
-rw-r--r-- root/root usr/share/lxpanel/images/xkb-flags/ae.png
|
||||||
@ -139,6 +143,11 @@ drwxr-xr-x root/root usr/share/lxpanel/profile/default/
|
|||||||
-rw-r--r-- root/root usr/share/lxpanel/profile/default/config
|
-rw-r--r-- root/root usr/share/lxpanel/profile/default/config
|
||||||
drwxr-xr-x root/root usr/share/lxpanel/profile/default/panels/
|
drwxr-xr-x root/root usr/share/lxpanel/profile/default/panels/
|
||||||
-rw-r--r-- root/root usr/share/lxpanel/profile/default/panels/panel
|
-rw-r--r-- root/root usr/share/lxpanel/profile/default/panels/panel
|
||||||
|
drwxr-xr-x root/root usr/share/lxpanel/profile/two_panels/
|
||||||
|
-rw-r--r-- root/root usr/share/lxpanel/profile/two_panels/config (EMPTY)
|
||||||
|
drwxr-xr-x root/root usr/share/lxpanel/profile/two_panels/panels/
|
||||||
|
-rw-r--r-- root/root usr/share/lxpanel/profile/two_panels/panels/bottom
|
||||||
|
-rw-r--r-- root/root usr/share/lxpanel/profile/two_panels/panels/top
|
||||||
drwxr-xr-x root/root usr/share/lxpanel/ui/
|
drwxr-xr-x root/root usr/share/lxpanel/ui/
|
||||||
-rw-r--r-- root/root usr/share/lxpanel/ui/launchbar.ui
|
-rw-r--r-- root/root usr/share/lxpanel/ui/launchbar.ui
|
||||||
-rw-r--r-- root/root usr/share/lxpanel/ui/netstatus.ui
|
-rw-r--r-- root/root usr/share/lxpanel/ui/netstatus.ui
|
||||||
|
@ -1 +1,2 @@
|
|||||||
129fae75d1cd3983fd94542c573a70a1 lxpanel-0.5.8.tar.gz
|
f27127f7c150036428a7c4005f69075c gmodule_link.patch
|
||||||
|
1bf3cce2a2d01c211f6897c42e8dd0bc lxpanel-0.5.10.tar.gz
|
||||||
|
@ -1,20 +1,25 @@
|
|||||||
# Description: desktop panel from lxde project
|
# Description: desktop panel from lxde project
|
||||||
# URL: http://lxde.org/
|
# URL: http://lxde.org/
|
||||||
# Maintainer: Bartlomiej Palmowski, rotwang at crux dot org dot pl
|
# Maintainer: Bartlomiej Palmowski, rotwang at crux dot org dot pl
|
||||||
# Depends on: gtk intltool menu-cache xorg-libxdamage
|
# Depends on: gtk menu-cache xorg-libxdamage
|
||||||
|
|
||||||
name=lxpanel
|
name=lxpanel
|
||||||
version=0.5.8
|
version=0.5.10
|
||||||
release=1
|
release=1
|
||||||
source=(http://download.sourceforge.net/sourceforge/lxde/$name-$version.tar.gz)
|
source=(http://download.sourceforge.net/sourceforge/lxde/$name-$version.tar.gz gmodule_link.patch)
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
cd $name-$version
|
cd $name-$version
|
||||||
|
patch -p1 -i ../gmodule_link.patch
|
||||||
|
rm -rf po/*
|
||||||
|
./autogen.sh
|
||||||
./configure \
|
./configure \
|
||||||
--prefix=/usr \
|
--prefix=/usr \
|
||||||
--mandir=/usr/man \
|
--mandir=/usr/man \
|
||||||
--disable-nls
|
--disable-nls \
|
||||||
|
--with-plugins=netstatus,volume,volumealsa,cpu,deskno,batt,kbled,xkb,thermal,cpufreq,monitors,wnckpager
|
||||||
make
|
make
|
||||||
make DESTDIR=$PKG install
|
make DESTDIR=$PKG install
|
||||||
rm -rf $PKG/usr/share/locale
|
rm -rf $PKG/usr/share/locale
|
||||||
}
|
}
|
||||||
|
|
||||||
|
86
lxpanel/gmodule_link.patch
Normal file
86
lxpanel/gmodule_link.patch
Normal file
@ -0,0 +1,86 @@
|
|||||||
|
diff -pruN lxpanel-0.5.10/autogen.sh lxpanel-0.5.10_new/autogen.sh
|
||||||
|
--- lxpanel-0.5.10/autogen.sh 2012-04-08 01:27:42.000000000 +0200
|
||||||
|
+++ lxpanel-0.5.10_new/autogen.sh 2012-12-17 19:03:28.000000000 +0100
|
||||||
|
@@ -2,16 +2,6 @@
|
||||||
|
AC_VERSION=
|
||||||
|
|
||||||
|
AUTOMAKE=${AUTOMAKE:-automake}
|
||||||
|
-AM_INSTALLED_VERSION=$($AUTOMAKE --version | sed -e '2,$ d' -e 's/.* \([0-9]*\.[0-9]*\).*/\1/')
|
||||||
|
-
|
||||||
|
-if [ "$AM_INSTALLED_VERSION" != "1.10" \
|
||||||
|
- -a "$AM_INSTALLED_VERSION" != "1.11" ];then
|
||||||
|
- echo
|
||||||
|
- echo "You must have automake > 1.10 or 1.11 installed to compile lxpanel."
|
||||||
|
- echo "Install the appropriate package for your distribution,"
|
||||||
|
- echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
|
||||||
|
- exit 1
|
||||||
|
-fi
|
||||||
|
|
||||||
|
set -x
|
||||||
|
|
||||||
|
@@ -22,7 +12,6 @@ fi
|
||||||
|
${ACLOCAL:-aclocal$AM_VERSION} ${ACLOCAL_ARG}
|
||||||
|
${AUTOHEADER:-autoheader$AC_VERSION} --force
|
||||||
|
AUTOMAKE=$AUTOMAKE libtoolize -c --automake --force
|
||||||
|
-AUTOMAKE=$AUTOMAKE intltoolize -c --automake --force
|
||||||
|
$AUTOMAKE --add-missing --copy --include-deps
|
||||||
|
${AUTOCONF:-autoconf$AC_VERSION}
|
||||||
|
|
||||||
|
diff -pruN lxpanel-0.5.10/configure.ac lxpanel-0.5.10_new/configure.ac
|
||||||
|
--- lxpanel-0.5.10/configure.ac 2012-06-10 23:22:21.000000000 +0200
|
||||||
|
+++ lxpanel-0.5.10_new/configure.ac 2012-12-17 19:05:11.000000000 +0100
|
||||||
|
@@ -1,6 +1,6 @@
|
||||||
|
AC_PREREQ(2.53)
|
||||||
|
AC_INIT(lxpanel, 0.5.10, http://lxde.org/)
|
||||||
|
-AM_INIT_AUTOMAKE([1.11 -Wall -Werror foreign])
|
||||||
|
+AM_INIT_AUTOMAKE([1.11 -Wall foreign])
|
||||||
|
AC_CONFIG_HEADER([config.h])
|
||||||
|
|
||||||
|
# Support silent build rules. Disable by either passing --disable-silent-rules
|
||||||
|
@@ -14,7 +14,6 @@ AC_DISABLE_STATIC
|
||||||
|
AC_PROG_CC
|
||||||
|
AC_PROG_INSTALL
|
||||||
|
AC_PROG_LN_S
|
||||||
|
-AC_PROG_INTLTOOL(, [no-xml])
|
||||||
|
AM_PROG_CC_C_O
|
||||||
|
|
||||||
|
#Initialize libtool
|
||||||
|
@@ -443,7 +442,6 @@ AC_CONFIG_FILES([
|
||||||
|
src/plugins/monitors/Makefile
|
||||||
|
src/plugins/wnckpager/Makefile
|
||||||
|
src/plugins/indicator/Makefile
|
||||||
|
- po/Makefile.in
|
||||||
|
data/Makefile
|
||||||
|
data/default/panels/panel
|
||||||
|
data/two_panels/panels/top
|
||||||
|
diff -pruN lxpanel-0.5.10/Makefile.am lxpanel-0.5.10_new/Makefile.am
|
||||||
|
--- lxpanel-0.5.10/Makefile.am 2012-04-08 01:27:42.000000000 +0200
|
||||||
|
+++ lxpanel-0.5.10_new/Makefile.am 2012-12-17 19:00:43.000000000 +0100
|
||||||
|
@@ -1,13 +1,9 @@
|
||||||
|
## Process this file with automake to produce Makefile.in
|
||||||
|
|
||||||
|
-SUBDIRS = src data po man
|
||||||
|
+SUBDIRS = src data man
|
||||||
|
|
||||||
|
EXTRA_DIST = \
|
||||||
|
autogen.sh \
|
||||||
|
- autogen.sh \
|
||||||
|
- intltool-extract.in \
|
||||||
|
- intltool-merge.in \
|
||||||
|
- intltool-update.in \
|
||||||
|
lxpanel.pc.in
|
||||||
|
|
||||||
|
pkgconfigdir = $(libdir)/pkgconfig
|
||||||
|
diff -pruN lxpanel-0.5.10/src/Makefile.am lxpanel-0.5.10_new/src/Makefile.am
|
||||||
|
--- lxpanel-0.5.10/src/Makefile.am 2012-04-08 01:27:42.000000000 +0200
|
||||||
|
+++ lxpanel-0.5.10_new/src/Makefile.am 2012-12-17 18:39:05.000000000 +0100
|
||||||
|
@@ -46,7 +46,8 @@ lxpanel_LDADD = \
|
||||||
|
$(BUILTIN_PLUGINS) \
|
||||||
|
$(PACKAGE_LIBS) \
|
||||||
|
$(X11_LIBS) \
|
||||||
|
- $(INTLLIBS)
|
||||||
|
+ $(INTLLIBS) \
|
||||||
|
+ -lgmodule-2.0
|
||||||
|
|
||||||
|
lxpanelctl_SOURCES = lxpanelctl.c lxpanelctl.h
|
||||||
|
lxpanelctl_LDADD = $(X11_LIBS) $(INTLLIBS)
|
Loading…
Reference in New Issue
Block a user