Index: 3.6.1/Makefile
===================================================================
--- 3.6.1/Makefile (nonexistent)
+++ 3.6.1/Makefile (revision 5)
@@ -0,0 +1,296 @@
+
+COMPONENT_TARGETS = $(HARDWARE_INTEL_PC32)
+COMPONENT_TARGETS += $(HARDWARE_INTEL_PC64)
+COMPONENT_TARGETS += $(HARDWARE_EBOX_3350DX2)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_ORANGE_PP2E)
+COMPONENT_TARGETS += $(HARDWARE_NANOPI_NEO)
+COMPONENT_TARGETS += $(HARDWARE_ORANGE_PP)
+COMPONENT_TARGETS += $(HARDWARE_ORANGE_PL2)
+COMPONENT_TARGETS += $(HARDWARE_WECHIP_TX6)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_POIN2)
+COMPONENT_TARGETS += $(HARDWARE_RK3328_CC)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_EDGE)
+COMPONENT_TARGETS += $(HARDWARE_LEEZ_P710)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM2)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OKMX6DL_C)
+COMPONENT_TARGETS += $(HARDWARE_OKMX6Q_C)
+COMPONENT_TARGETS += $(HARDWARE_BONE_BLACK)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BAIKAL_T1)
+COMPONENT_TARGETS += $(HARDWARE_BAIKAL_M1)
+COMPONENT_TARGETS += $(HARDWARE_S824L)
+COMPONENT_TARGETS += $(HARDWARE_VESNIN)
+COMPONENT_TARGETS += $(HARDWARE_S824L_LSB)
+COMPONENT_TARGETS += $(HARDWARE_VESNIN_LSB)
+COMPONENT_TARGETS += $(HARDWARE_TL2WK2)
+COMPONENT_TARGETS += $(HARDWARE_TL2SV2)
+COMPONENT_TARGETS += $(HARDWARE_TL2WK2_LSB)
+COMPONENT_TARGETS += $(HARDWARE_TL2SV2_LSB)
+COMPONENT_TARGETS += $(HARDWARE_SIFIVE_U740)
+
+
+NEED_ABS_PATH = true
+COMPONENT_IS_3PP = true
+
+
+include ../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES = sources/packages/x/openbox
+
+REQUIRES = X11/X.org/xserver/xorg-server/21.1.7
+REQUIRES += X11/X.org/lib/libXinerama/1.1.5
+REQUIRES += X11/libs/imlib2/1.11.0
+REQUIRES += X11/libs/startup-notification/0.12
+REQUIRES += libs/libxml2/2.9.9
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version = 3.6.1
+tar_xz_archive = $(SRC_PACKAGE_PATH)/packages/x/openbox/openbox-$(version).tar.xz
+SRC_ARCHIVE = $(tar_xz_archive)
+SRC_DIR = $(TARGET_BUILD_DIR)/openbox-$(version)
+src_dir_name = openbox-$(version)
+src_done = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir = $(TARGET_BUILD_DIR)/build
+build_target = $(TARGET_BUILD_DIR)/.build_done
+install_target = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xapp
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+OPENBOX_PKG_NAME = openbox
+OPENBOX_PKG_VERSION = 3.6.1
+OPENBOX_PKG_ARCH = $(PKGARCH)
+OPENBOX_PKG_DISTRO_NAME = $(DISTRO_NAME)
+OPENBOX_PKG_DISTRO_VERSION = $(DISTRO_VERSION)
+OPENBOX_PKG_GROUP = $(PKG_GROUP)
+### |---handy-ruler-------------------------------|
+OPENBOX_PKG_SHORT_DESCRIPTION = Openbox window manager
+OPENBOX_PKG_URL = $(BUG_URL)
+OPENBOX_PKG_LICENSE = GPLv2
+OPENBOX_PKG_DESCRIPTION_FILE = $(TARGET_BUILD_DIR)/$(OPENBOX_PKG_NAME)-pkg-description
+OPENBOX_PKG_DESCRIPTION_FILE_IN = $(OPENBOX_PKG_NAME)-pkg-description.in
+OPENBOX_PKG_INSTALL_SCRIPT = $(OPENBOX_PKG_NAME)-pkg-install.sh
+
+OPENBOX_PKG = $(CURDIR)/$(TARGET_BUILD_DIR)/$(OPENBOX_PKG_NAME)-package
+
+pkg_basename = $(OPENBOX_PKG_NAME)-$(OPENBOX_PKG_VERSION)-$(OPENBOX_PKG_ARCH)-$(OPENBOX_PKG_DISTRO_NAME)-$(OPENBOX_PKG_DISTRO_VERSION)
+
+pkg_archive = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature = $(call sign-name,$(pkg_archive))
+pkg_description = $(call desc-name,$(pkg_archive))
+products = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS = $(build_target)
+BUILD_TARGETS += $(install_target)
+
+PRODUCT_TARGETS = $(products)
+
+ROOTFS_TARGETS = $(pkg_archive)
+
+
+include ../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(OPENBOX_PKG)
+
+
+extra_configure_switches = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+extra_configure_switches += --enable-startup-notification
+
+ifeq ($(__ENABLE_STATIC__),yes)
+extra_configure_switches += --enable-static=yes
+else
+extra_configure_switches += --enable-static=no
+endif
+extra_configure_switches += --enable-shared=yes
+
+
+CFLAGS += -Wno-deprecated-declarations -Wno-return-local-addr
+
+TARGET_BIN_RPATH = /lib$(LIBSUFFIX):/usr/lib$(LIBSUFFIX)
+TARGET_LIB_RPATH = /lib$(LIBSUFFIX):/usr/lib$(LIBSUFFIX):/usr/lib/../lib$(LIBSUFFIX)
+
+LDFLAGS += -Wl,-rpath,$(TARGET_BIN_RPATH)
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+ $(UNPACK_SRC_ARCHIVE)
+ $(APPLY_PATCHES)
+ @touch $@
+
+$(build_target): $(src_done)
+ @mkdir -p $(build_dir)
+ @cd $(build_dir) && \
+ $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+ --prefix=/usr \
+ --build=$(BUILD) \
+ --host=$(TARGET) \
+ $(extra_configure_switches)
+ @cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+ @touch $@
+
+$(install_target): $(build_target)
+ @mkdir -p $(OPENBOX_PKG)
+ @cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+ # ======= Install Documentation =======
+ @if [ -d $(OPENBOX_PKG)/usr/share/man ]; then \
+ ( cd $(OPENBOX_PKG)/usr/share/man ; \
+ for manpagedir in `find . -type d -name "man*"` ; do \
+ ( cd $$manpagedir ; \
+ for eachpage in `find . -type l -maxdepth 1` ; do \
+ ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+ rm $$eachpage ; \
+ done ; \
+ gzip -9 *.? ; \
+ ) \
+ done \
+ ) \
+ fi
+ @mkdir -p $(OPENBOX_PKG)/usr/doc/$(src_dir_name)
+ @cp -a $(SRC_DIR)/AUTHORS $(SRC_DIR)/COPYING \
+ $(OPENBOX_PKG)/usr/doc/$(src_dir_name)
+ @mkdir -p $(OPENBOX_PKG)/usr/share/doc/$(src_dir_name)/xinit
+ @( cd $(SRC_DIR) ; \
+ cp -a AUTHORS COPYING README \
+ $(OPENBOX_PKG)/usr/share/doc/$(src_dir_name) ; \
+ )
+ @for file in $(CURDIR)/xinit/xinitrc.*openbox* ; do \
+ cat $${file} > $(OPENBOX_PKG)/usr/share/doc/$(src_dir_name)/xinit/`basename $${file}` ; \
+ done
+ @( cd $(SRC_DIR) ; \
+ if [ -r CHANGELOG -a -s CHANGELOG ]; then \
+ DOCSDIR=`echo $(OPENBOX_PKG)/usr/share/doc/$(src_dir_name)` ; \
+ cat CHANGELOG | head -n 1000 > $$DOCSDIR/CHANGELOG ; \
+ touch -r CHANGELOG $$DOCSDIR/CHANGELOG ; \
+ fi \
+ )
+ # ======= Install xinitrc scripts =======
+ @mkdir -p $(OPENBOX_PKG)/etc/X11/xinit
+ # ======= Add xinitrc.openbox so that openbox will show up as an option in xwmconfig =======
+ @install -D -m 0755 $(CURDIR)/xinit/xinitrc.openbox $(OPENBOX_PKG)/etc/X11/xinit/xinitrc.openbox
+ # ======= Add xinitrc.openbox-session so that openbox-session will show up as an option in xwmconfig =======
+ @install -D -m 0755 $(CURDIR)/xinit/xinitrc.openbox-session $(OPENBOX_PKG)/etc/X11/xinit/xinitrc.openbox-session
+ # ======= Move the KDE and GNOME scripts from /usr/bin =======
+ @cat $(OPENBOX_PKG)/usr/bin/openbox-kde-session > $(OPENBOX_PKG)/usr/share/doc/$(src_dir_name)/openbox-kde-session
+ @rm -f $(OPENBOX_PKG)/usr/bin/openbox-kde-session
+ @cat $(OPENBOX_PKG)/usr/bin/openbox-gnome-session > $(OPENBOX_PKG)/usr/share/doc/$(src_dir_name)/openbox-gnome-session
+ @rm -f $(OPENBOX_PKG)/usr/bin/openbox-gnome-session
+ # ======= Change name of openbox.desktop KDM session file so it corresponds to openbox-session =======
+ @( cd $(OPENBOX_PKG)/usr/share/xsessions ; \
+ mv openbox.desktop openbox-session.desktop ; \
+ sed -i "s/Name=Openbox/Name=Openbox-Session/" openbox-session.desktop ; \
+ )
+ # ======= Create symlinks to KDM session desktop files so KDM will use them =======
+ @mkdir -p $(OPENBOX_PKG)/usr/share/apps/kdm/sessions
+ @( cd $(OPENBOX_PKG)/usr/share/apps/kdm/sessions ; \
+ for file in $(OPENBOX_PKG)/usr/share/xsessions/openbox*.desktop ; do \
+ ln -sf ../../../xsessions/`basename $${file}` . ; \
+ done ; \
+ )
+ # ======= remove toolchain path from target libtool *.la files =======
+ @( cd $(OPENBOX_PKG)/usr/lib$(LIBSUFFIX) ; \
+ sed -i "s,$(TARGET_DEST_DIR),,g" libobrender.la libobt.la ; \
+ )
+ # ======= Install the same to $(TARGET_DEST_DIR) =======
+ $(call install-into-devenv, $(OPENBOX_PKG))
+ # ======= tune libtool *.la search path to the target destination for development =======
+ @( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX) ; \
+ sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libobrender.la libobt.la ; \
+ sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" libobrender.la libobt.la ; \
+ )
+ # ======= tune pkg-config *.pc search path to the target destination for development =======
+ @( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/pkgconfig ; \
+ sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" obrender-?.?.pc obt-?.?.pc ; \
+ )
+ # ======= Strip binaries =======
+ @( cd $(OPENBOX_PKG) ; \
+ find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+ find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+ )
+ifeq ($(__ENABLE_STATIC__),yes)
+ @( cd $(OPENBOX_PKG) ; \
+ find . | xargs file | grep "current ar archive" | cut -f 1 -d : | xargs $(STRIP) -g 2> /dev/null ; \
+ )
+endif
+ifneq ($(PATCHELF),)
+ # ======= Set RPATH/RUNPATH for target binaries =======
+ @( cd $(OPENBOX_PKG)/usr/bin ; \
+ for file in `find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
+ rpath=`$(PATCHELF) --print-rpath $$file 2> /dev/null` ; \
+ if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
+ $(PATCHELF) --set-rpath $(TARGET_BIN_RPATH) $$file 1> /dev/null 2> /dev/null ; \
+ fi ; \
+ done ; \
+ )
+ # ======= Set RPATH/RUNPATH for target shared objects =======
+ @( cd $(OPENBOX_PKG)/usr/lib$(LIBSUFFIX) ; \
+ for file in `find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
+ rpath=`$(PATCHELF) --print-rpath $$file 2> /dev/null` ; \
+ if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
+ $(PATCHELF) --set-rpath $(TARGET_LIB_RPATH) $$file 1> /dev/null 2> /dev/null ; \
+ fi ; \
+ done ; \
+ )
+endif
+ @touch $@
+
+$(OPENBOX_PKG_DESCRIPTION_FILE): $(OPENBOX_PKG_DESCRIPTION_FILE_IN)
+ @cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_certificate) : $(pkg_archive) ;
+$(pkg_signature) : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(OPENBOX_PKG_DESCRIPTION_FILE) $(OPENBOX_PKG_INSTALL_SCRIPT)
+ @cp $(OPENBOX_PKG_DESCRIPTION_FILE) $(OPENBOX_PKG)/.DESCRIPTION
+ @cp $(OPENBOX_PKG_INSTALL_SCRIPT) $(OPENBOX_PKG)/.INSTALL
+ @$(BUILD_PKG_REQUIRES) $(OPENBOX_PKG)/.REQUIRES
+ @echo "pkgname=$(OPENBOX_PKG_NAME)" > $(OPENBOX_PKG)/.PKGINFO ; \
+ echo "pkgver=$(OPENBOX_PKG_VERSION)" >> $(OPENBOX_PKG)/.PKGINFO ; \
+ echo "arch=$(OPENBOX_PKG_ARCH)" >> $(OPENBOX_PKG)/.PKGINFO ; \
+ echo "distroname=$(OPENBOX_PKG_DISTRO_NAME)" >> $(OPENBOX_PKG)/.PKGINFO ; \
+ echo "distrover=$(OPENBOX_PKG_DISTRO_VERSION)" >> $(OPENBOX_PKG)/.PKGINFO ; \
+ echo "group=$(OPENBOX_PKG_GROUP)" >> $(OPENBOX_PKG)/.PKGINFO ; \
+ echo "short_description=\"$(OPENBOX_PKG_SHORT_DESCRIPTION)\"" >> $(OPENBOX_PKG)/.PKGINFO ; \
+ echo "url=$(OPENBOX_PKG_URL)" >> $(OPENBOX_PKG)/.PKGINFO ; \
+ echo "license=$(OPENBOX_PKG_LICENSE)" >> $(OPENBOX_PKG)/.PKGINFO
+ @$(PSEUDO) sh -c "cd $(OPENBOX_PKG) && \
+ chown -R root:root . && \
+ $(MAKE_PACKAGE) -J --linkadd=yes $(GNUPG_OPTIONS) -m -d .. ."
Index: 3.6.1/PATCHES
===================================================================
--- 3.6.1/PATCHES (nonexistent)
+++ 3.6.1/PATCHES (revision 5)
@@ -0,0 +1,2 @@
+
+../../../../sources/packages/x/openbox/patches/openbox-3.6.1-xdg-autostart.patch -p0
Index: 3.6.1/openbox-pkg-description.in
===================================================================
--- 3.6.1/openbox-pkg-description.in (nonexistent)
+++ 3.6.1/openbox-pkg-description.in (revision 5)
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description. Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':'.
+
+ |-----handy-ruler------------------------------------------------------|
+openbox: openbox @VERSION@ (Openbox window manager)
+openbox:
+openbox: Openbox is a standards compliant, fast, light-weight, extensible
+openbox: window manager. Openbox was written first to comply with standards
+openbox: and to work properly. Openbox is fully functional as a stand-alone
+openbox: working environment, or can be used as a drop-in replacement for
+openbox: the default window manager in the GNOME or KDE desktop environments.
+openbox:
+openbox: Homepage: http://openbox.org
+openbox:
+openbox:
Index: 3.6.1/openbox-pkg-install.sh
===================================================================
--- 3.6.1/openbox-pkg-install.sh (nonexistent)
+++ 3.6.1/openbox-pkg-install.sh (revision 5)
@@ -0,0 +1,56 @@
+#!/bin/sh
+
+# Preserve new files
+install_file() {
+ NEW="$1"
+ OLD="`dirname $NEW`/`basename $NEW .new`"
+ # If there's no file by that name, mv it over:
+ if [ ! -r $OLD ]; then
+ mv $NEW $OLD
+ elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy
+ rm $NEW
+ fi
+ # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+
+# arg 1: the new package version
+pre_install() {
+ /bin/true
+}
+
+# arg 1: the new package version
+post_install() {
+ # Update desktop database
+ if [ -x /usr/bin/update-desktop-database ]; then
+ /usr/bin/update-desktop-database -q usr/share/applications > /dev/null 2>&1
+ fi
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+pre_update() {
+ /bin/true
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+post_update() {
+ post_install
+}
+
+# arg 1: the old package version
+pre_remove() {
+ /bin/true
+}
+
+# arg 1: the old package version
+post_remove() {
+ /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
Property changes on: 3.6.1/openbox-pkg-install.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: 3.6.1/xinit/xinitrc.gnome-openbox
===================================================================
--- 3.6.1/xinit/xinitrc.gnome-openbox (nonexistent)
+++ 3.6.1/xinit/xinitrc.gnome-openbox (revision 5)
@@ -0,0 +1,22 @@
+#!/bin/sh
+# $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
+
+# merge in defaults and keymaps
+[ -f $sysresources ] && /usr/bin/xrdb -merge $sysresources
+[ -f $sysmodmap ] && /usr/bin/xmodmap $sysmodmap
+[ -f $userresources ] && /usr/bin/xrdb -merge $userresources
+[ -f $usermodmap ] && /usr/bin/xmodmap $usermodmap
+
+# Create default user directory & populate it if not already existent
+if [ ! -d $HOME/.config/openbox ]; then
+ mkdir -p $HOME/.config/openbox
+ cat /etc/xdg/openbox/menu.xml > $HOME/.config/openbox/menu.xml
+ cat /etc/xdg/openbox/rc.xml > $HOME/.config/openbox/rc.xml
+fi
+
+exec openbox-gnome-session
Index: 3.6.1/xinit/xinitrc.kde-openbox
===================================================================
--- 3.6.1/xinit/xinitrc.kde-openbox (nonexistent)
+++ 3.6.1/xinit/xinitrc.kde-openbox (revision 5)
@@ -0,0 +1,22 @@
+#!/bin/sh
+# $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
+
+# merge in defaults and keymaps
+[ -f $sysresources ] && /usr/bin/xrdb -merge $sysresources
+[ -f $sysmodmap ] && /usr/bin/xmodmap $sysmodmap
+[ -f $userresources ] && /usr/bin/xrdb -merge $userresources
+[ -f $usermodmap ] && /usr/bin/xmodmap $usermodmap
+
+# Create default user directory & populate it if not already existent
+if [ ! -d $HOME/.config/openbox ]; then
+ mkdir -p $HOME/.config/openbox
+ cat /etc/xdg/openbox/menu.xml > $HOME/.config/openbox/menu.xml
+ cat /etc/xdg/openbox/rc.xml > $HOME/.config/openbox/rc.xml
+fi
+
+exec openbox-kde-session
Index: 3.6.1/xinit/xinitrc.openbox
===================================================================
--- 3.6.1/xinit/xinitrc.openbox (nonexistent)
+++ 3.6.1/xinit/xinitrc.openbox (revision 5)
@@ -0,0 +1,27 @@
+#!/bin/sh
+# $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
+
+# merge in defaults and keymaps
+[ -f $sysresources ] && /usr/bin/xrdb -merge $sysresources
+[ -f $sysmodmap ] && /usr/bin/xmodmap $sysmodmap
+[ -f $userresources ] && /usr/bin/xrdb -merge $userresources
+[ -f $usermodmap ] && /usr/bin/xmodmap $usermodmap
+
+# Create default user directory & populate it if not already existent
+if [ ! -d $HOME/.config/openbox ]; then
+ mkdir -p $HOME/.config/openbox
+ cat /etc/xdg/openbox/menu.xml > $HOME/.config/openbox/menu.xml
+ cat /etc/xdg/openbox/rc.xml > $HOME/.config/openbox/rc.xml
+fi
+
+if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
+ exec ck-launch-session dbus-launch --exit-with-session openbox
+else
+ exec openbox
+fi
+
Index: 3.6.1/xinit/xinitrc.openbox-session
===================================================================
--- 3.6.1/xinit/xinitrc.openbox-session (nonexistent)
+++ 3.6.1/xinit/xinitrc.openbox-session (revision 5)
@@ -0,0 +1,27 @@
+#!/bin/sh
+# $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
+
+# merge in defaults and keymaps
+[ -f $sysresources ] && /usr/bin/xrdb -merge $sysresources
+[ -f $sysmodmap ] && /usr/bin/xmodmap $sysmodmap
+[ -f $userresources ] && /usr/bin/xrdb -merge $userresources
+[ -f $usermodmap ] && /usr/bin/xmodmap $usermodmap
+
+# Create default user directory & populate it if not already existent
+if [ ! -d $HOME/.config/openbox ]; then
+ mkdir -p $HOME/.config/openbox
+ cat /etc/xdg/openbox/menu.xml > $HOME/.config/openbox/menu.xml
+ cat /etc/xdg/openbox/rc.xml > $HOME/.config/openbox/rc.xml
+fi
+
+if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
+ exec ck-launch-session dbus-launch --exit-with-session openbox-session
+else
+ exec openbox-session
+fi
+
Index: 3.6.1/xinit
===================================================================
--- 3.6.1/xinit (nonexistent)
+++ 3.6.1/xinit (revision 5)
Property changes on: 3.6.1/xinit
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,73 ##
+
+# install dir
+dist
+
+# Target build dirs
+.a1x-newlib
+.a2x-newlib
+.at91sam7s-newlib
+
+.build-machine
+
+.a1x-glibc
+.a2x-glibc
+.h3-glibc
+.h5-glibc
+.i586-glibc
+.i686-glibc
+.imx6-glibc
+.jz47xx-glibc
+.makefile
+.am335x-glibc
+.omap543x-glibc
+.p5600-glibc
+.power8-glibc
+.power8le-glibc
+.power9-glibc
+.power9le-glibc
+.m1000-glibc
+.riscv64-glibc
+.rk328x-glibc
+.rk33xx-glibc
+.rk339x-glibc
+.s8xx-glibc
+.s9xx-glibc
+.x86_64-glibc
+
+# Hidden files (each file)
+.makefile
+.dist
+.rootfs
+
+# src & hw requires
+.src_requires
+.src_requires_depend
+.requires
+.requires_depend
+
+# Tarballs
+*.gz
+*.bz2
+*.lz
+*.xz
+*.tgz
+*.txz
+
+# Signatures
+*.asc
+*.sig
+*.sign
+*.sha1sum
+
+# Patches
+*.patch
+
+# Descriptions
+*.dsc
+*.txt
+
+# Default linux config files
+*.defconfig
+
+# backup copies
+*~
Index: 3.6.1
===================================================================
--- 3.6.1 (nonexistent)
+++ 3.6.1 (revision 5)
Property changes on: 3.6.1
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,73 ##
+
+# install dir
+dist
+
+# Target build dirs
+.a1x-newlib
+.a2x-newlib
+.at91sam7s-newlib
+
+.build-machine
+
+.a1x-glibc
+.a2x-glibc
+.h3-glibc
+.h5-glibc
+.i586-glibc
+.i686-glibc
+.imx6-glibc
+.jz47xx-glibc
+.makefile
+.am335x-glibc
+.omap543x-glibc
+.p5600-glibc
+.power8-glibc
+.power8le-glibc
+.power9-glibc
+.power9le-glibc
+.m1000-glibc
+.riscv64-glibc
+.rk328x-glibc
+.rk33xx-glibc
+.rk339x-glibc
+.s8xx-glibc
+.s9xx-glibc
+.x86_64-glibc
+
+# Hidden files (each file)
+.makefile
+.dist
+.rootfs
+
+# src & hw requires
+.src_requires
+.src_requires_depend
+.requires
+.requires_depend
+
+# Tarballs
+*.gz
+*.bz2
+*.lz
+*.xz
+*.tgz
+*.txz
+
+# Signatures
+*.asc
+*.sig
+*.sign
+*.sha1sum
+
+# Patches
+*.patch
+
+# Descriptions
+*.dsc
+*.txt
+
+# Default linux config files
+*.defconfig
+
+# backup copies
+*~
Index: .
===================================================================
--- . (nonexistent)
+++ . (revision 5)
Property changes on: .
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,73 ##
+
+# install dir
+dist
+
+# Target build dirs
+.a1x-newlib
+.a2x-newlib
+.at91sam7s-newlib
+
+.build-machine
+
+.a1x-glibc
+.a2x-glibc
+.h3-glibc
+.h5-glibc
+.i586-glibc
+.i686-glibc
+.imx6-glibc
+.jz47xx-glibc
+.makefile
+.am335x-glibc
+.omap543x-glibc
+.p5600-glibc
+.power8-glibc
+.power8le-glibc
+.power9-glibc
+.power9le-glibc
+.m1000-glibc
+.riscv64-glibc
+.rk328x-glibc
+.rk33xx-glibc
+.rk339x-glibc
+.s8xx-glibc
+.s9xx-glibc
+.x86_64-glibc
+
+# Hidden files (each file)
+.makefile
+.dist
+.rootfs
+
+# src & hw requires
+.src_requires
+.src_requires_depend
+.requires
+.requires_depend
+
+# Tarballs
+*.gz
+*.bz2
+*.lz
+*.xz
+*.tgz
+*.txz
+
+# Signatures
+*.asc
+*.sig
+*.sign
+*.sha1sum
+
+# Patches
+*.patch
+
+# Descriptions
+*.dsc
+*.txt
+
+# Default linux config files
+*.defconfig
+
+# backup copies
+*~