summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--extra/openbox/.footprint44
-rw-r--r--extra/openbox/.md5sum3
-rw-r--r--extra/openbox/Pkgfile12
-rwxr-xr-xextra/openbox/openbox.xinitrc2
4 files changed, 39 insertions, 22 deletions
diff --git a/extra/openbox/.footprint b/extra/openbox/.footprint
index d59d4c118..05be41726 100644
--- a/extra/openbox/.footprint
+++ b/extra/openbox/.footprint
@@ -1,4 +1,10 @@
drwxr-xr-x root/root etc/
+drwxr-xr-x root/root etc/X11/
+drwxr-xr-x root/root etc/X11/dm/
+-rw-r--r-- root/root etc/X11/dm/openbox.xinitrc
+drwxr-xr-x root/root etc/qingy/
+drwxr-xr-x root/root etc/qingy/sessions/
+-rwxr-xr-x root/root etc/qingy/sessions/openbox
drwxr-xr-x root/root etc/xdg/
drwxr-xr-x root/root etc/xdg/openbox/
-rw-r--r-- root/root etc/xdg/openbox/autostart.sh
@@ -15,30 +21,30 @@ drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/openbox-session
drwxr-xr-x root/root usr/include/
drwxr-xr-x root/root usr/include/openbox/
-drwxr-xr-x root/root usr/include/openbox/3.4.11/
-drwxr-xr-x root/root usr/include/openbox/3.4.11/openbox/
--rw-r--r-- root/root usr/include/openbox/3.4.11/openbox/color.h
--rw-r--r-- root/root usr/include/openbox/3.4.11/openbox/font.h
--rw-r--r-- root/root usr/include/openbox/3.4.11/openbox/geom.h
--rw-r--r-- root/root usr/include/openbox/3.4.11/openbox/gradient.h
--rw-r--r-- root/root usr/include/openbox/3.4.11/openbox/image.h
--rw-r--r-- root/root usr/include/openbox/3.4.11/openbox/instance.h
--rw-r--r-- root/root usr/include/openbox/3.4.11/openbox/mask.h
--rw-r--r-- root/root usr/include/openbox/3.4.11/openbox/parse.h
--rw-r--r-- root/root usr/include/openbox/3.4.11/openbox/render.h
--rw-r--r-- root/root usr/include/openbox/3.4.11/openbox/theme.h
--rw-r--r-- root/root usr/include/openbox/3.4.11/openbox/version.h
+drwxr-xr-x root/root usr/include/openbox/3.4.11.2/
+drwxr-xr-x root/root usr/include/openbox/3.4.11.2/openbox/
+-rw-r--r-- root/root usr/include/openbox/3.4.11.2/openbox/color.h
+-rw-r--r-- root/root usr/include/openbox/3.4.11.2/openbox/font.h
+-rw-r--r-- root/root usr/include/openbox/3.4.11.2/openbox/geom.h
+-rw-r--r-- root/root usr/include/openbox/3.4.11.2/openbox/gradient.h
+-rw-r--r-- root/root usr/include/openbox/3.4.11.2/openbox/image.h
+-rw-r--r-- root/root usr/include/openbox/3.4.11.2/openbox/instance.h
+-rw-r--r-- root/root usr/include/openbox/3.4.11.2/openbox/mask.h
+-rw-r--r-- root/root usr/include/openbox/3.4.11.2/openbox/parse.h
+-rw-r--r-- root/root usr/include/openbox/3.4.11.2/openbox/render.h
+-rw-r--r-- root/root usr/include/openbox/3.4.11.2/openbox/theme.h
+-rw-r--r-- root/root usr/include/openbox/3.4.11.2/openbox/version.h
drwxr-xr-x root/root usr/lib/
-rw-r--r-- root/root usr/lib/libobparser.a
-rwxr-xr-x root/root usr/lib/libobparser.la
-lrwxrwxrwx root/root usr/lib/libobparser.so -> libobparser.so.21.0.7
-lrwxrwxrwx root/root usr/lib/libobparser.so.21 -> libobparser.so.21.0.7
--rwxr-xr-x root/root usr/lib/libobparser.so.21.0.7
+lrwxrwxrwx root/root usr/lib/libobparser.so -> libobparser.so.21.0.9
+lrwxrwxrwx root/root usr/lib/libobparser.so.21 -> libobparser.so.21.0.9
+-rwxr-xr-x root/root usr/lib/libobparser.so.21.0.9
-rw-r--r-- root/root usr/lib/libobrender.a
-rwxr-xr-x root/root usr/lib/libobrender.la
-lrwxrwxrwx root/root usr/lib/libobrender.so -> libobrender.so.21.0.7
-lrwxrwxrwx root/root usr/lib/libobrender.so.21 -> libobrender.so.21.0.7
--rwxr-xr-x root/root usr/lib/libobrender.so.21.0.7
+lrwxrwxrwx root/root usr/lib/libobrender.so -> libobrender.so.21.0.9
+lrwxrwxrwx root/root usr/lib/libobrender.so.21 -> libobrender.so.21.0.9
+-rwxr-xr-x root/root usr/lib/libobrender.so.21.0.9
drwxr-xr-x root/root usr/lib/openbox/
-rwxr-xr-x root/root usr/lib/openbox/xdg-autostart
drwxr-xr-x root/root usr/lib/pkgconfig/
diff --git a/extra/openbox/.md5sum b/extra/openbox/.md5sum
index 836f2cd5d..a646c637a 100644
--- a/extra/openbox/.md5sum
+++ b/extra/openbox/.md5sum
@@ -1 +1,2 @@
-bbbb93c1a4fc8048f2a8ceb4179882a5 openbox-3.4.11.tar.gz
+30e669134fa81df810fe7d1dc59cd931 openbox-3.4.11.2.tar.gz
+3f8da161d83fe8ed231c651ab7f44db3 openbox.xinitrc
diff --git a/extra/openbox/Pkgfile b/extra/openbox/Pkgfile
index dfcc4f6cc..ecf7f1fe4 100644
--- a/extra/openbox/Pkgfile
+++ b/extra/openbox/Pkgfile
@@ -5,9 +5,11 @@
# Depends on: startup-notification, pango, hal
name=openbox
-version=3.4.11
+version=3.4.11.2
release=1
-source=(http://icculus.org/openbox/releases/$name-$version.tar.gz)
+source=(http://icculus.org/openbox/releases/$name-$version.tar.gz \
+ openbox.xinitrc)
+
build()
{
cd $name-$version
@@ -17,5 +19,11 @@ cd $name-$version
--sysconfdir=/etc
make
make DESTDIR=$PKG install
+install -D -m644 ../openbox.xinitrc \
+$PKG/etc/X11/dm/openbox.xinitrc
+mkdir -p $PKG/etc/qingy/sessions
+echo "userclientrc=/etc/X11/dm/openbox.xinitrc /usr/bin/startx.qingy" > \
+$PKG/etc/qingy/sessions/openbox
+chmod 755 $PKG/etc/qingy/sessions/openbox
}
diff --git a/extra/openbox/openbox.xinitrc b/extra/openbox/openbox.xinitrc
new file mode 100755
index 000000000..485218d82
--- /dev/null
+++ b/extra/openbox/openbox.xinitrc
@@ -0,0 +1,2 @@
+dbus-launch --exit-with-session &
+openbox-session \ No newline at end of file