diff options
32 files changed, 204 insertions, 1118 deletions
diff --git a/arch/3.5.13/trinity-base/hal/PKGBUILD b/arch/3.5.13/trinity-base/hal/PKGBUILD index 2ca441478..599b66d59 100644 --- a/arch/3.5.13/trinity-base/hal/PKGBUILD +++ b/arch/3.5.13/trinity-base/hal/PKGBUILD @@ -5,7 +5,7 @@ pkgname=hal pkgver=0.5.14 -pkgrel=6 +pkgrel=7 pkgdesc="Hardware Abstraction Layer" arch=(i686 x86_64) license=('GPL' 'custom') diff --git a/arch/3.5.13/trinity-base/hal/patches/dbus-error-init.patch b/arch/3.5.13/trinity-base/hal/patches/dbus-error-init.patch deleted file mode 100644 index fb3ad020a..000000000 --- a/arch/3.5.13/trinity-base/hal/patches/dbus-error-init.patch +++ /dev/null @@ -1,231 +0,0 @@ -From dcb2829b8eff61463b0869614ddb07b1c86cecaa Mon Sep 17 00:00:00 2001 -From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc> -Date: Wed, 30 Dec 2009 11:42:52 +0000 -Subject: linux/probe-input: don't use error prio init - -it may happen in the out: case that LIBHAL_FREE_DBUS_ERROR (&error) is -called before the error structure is initialized via -dbus_error_init (&error). This could lead to a segfault during startup -as seen in dmesg: - -|Intel AES-NI instructions are not detected. -|padlock: VIA PadLock not detected. -|hald-probe-inpu[1793]: segfault at 2 ip 00007f656fb68969 sp 00007fff39eeb950 error 4 in libc-2.10.2.so[7f656faf3000+14a000] -|hald-probe-inpu[1796]: segfault at 2 ip 00007fa2c3293969 sp 00007fffd92a5dd0 error 4 in libc-2.10.2.so[7fa2c321e000+14a000] -|hald-probe-inpu[1797]: segfault at 2 ip 00007f1d08ba2969 sp 00007fff34244e30 error 4 in libc-2.10.2.so[7f1d08b2d000+14a000] -|hald-probe-inpu[1799]: segfault at 2 ip 00007f35c0e3d969 sp 00007fffe5ec7ee0 error 4 in libc-2.10.2.so[7f35c0dc8000+14a000] -|hald-probe-inpu[1800]: segfault at 2 ip 00007f931c556969 sp 00007fffe1825b60 error 4 in libc-2.10.2.so[7f931c4e1000+14a000] -|hald-probe-inpu[1801]: segfault at 2 ip 00007f5156d9a969 sp 00007fff4e620af0 error 4 in libc-2.10.2.so[7f5156d25000+14a000] -|RPC: Registered udp transport module. -|RPC: Registered tcp transport module. - -What I run into seems to be reported as Debian #562068 [0]. This patch -makes the segfault go away on my machine. - -[0] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=562068 - -Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc> -Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com> ---- -diff --git a/hald/linux/probing/probe-input.c b/hald/linux/probing/probe-input.c -index 94e9929..cad47d3 100644 ---- a/hald/linux/probing/probe-input.c -+++ b/hald/linux/probing/probe-input.c -@@ -70,6 +70,7 @@ main (int argc, char *argv[]) - fd = -1; - - setup_logger (); -+ dbus_error_init (&error); - - button_type = getenv ("HAL_PROP_BUTTON_TYPE"); - if (button_type == NULL) -@@ -96,7 +97,6 @@ main (int argc, char *argv[]) - if (udi == NULL) - goto out; - -- dbus_error_init (&error); - if ((ctx = libhal_ctx_init_direct (&error)) == NULL) - goto out; - --- -cgit v0.8.3-6-g21f6 -From baa61a879985d63f549854518ef14efd40e62e8c Mon Sep 17 00:00:00 2001 -From: Peter Jones <pjones@redhat.com> -Date: Wed, 24 Feb 2010 16:19:28 +0000 -Subject: Make sure dbus_error_init() is called before LIBHAL_FREE_DBUS_ERROR() - -If dbus_error_init() is not called before LIBHAL_FREE_DBUS_ERROR() is -called on that error, then it is uninitialized and may segfault. This -means that dbus_error_init() must be called before any "goto out" if -"out:" calls LIBHAL_FREE_DBUS_ERROR(). - -Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com> ---- -diff --git a/hald/linux/probing/probe-hiddev.c b/hald/linux/probing/probe-hiddev.c -index 45d2084..bffc040 100644 ---- a/hald/linux/probing/probe-hiddev.c -+++ b/hald/linux/probing/probe-hiddev.c -@@ -57,11 +57,12 @@ main (int argc, char *argv[]) - /* assume failure */ - ret = 1; - -+ dbus_error_init (&error); -+ - udi = getenv ("UDI"); - if (udi == NULL) - goto out; - -- dbus_error_init (&error); - if ((ctx = libhal_ctx_init_direct (&error)) == NULL) - goto out; - -diff --git a/hald/linux/probing/probe-ieee1394-unit.c b/hald/linux/probing/probe-ieee1394-unit.c -index 70b0f86..aaa92e2 100644 ---- a/hald/linux/probing/probe-ieee1394-unit.c -+++ b/hald/linux/probing/probe-ieee1394-unit.c -@@ -388,6 +388,8 @@ int main (int argc, char *argv[]) - - setup_logger (); - -+ dbus_error_init (&error); -+ - udi = getenv ("UDI"); - if (udi == NULL) - goto out; -@@ -396,7 +398,6 @@ int main (int argc, char *argv[]) - if (ieee1394_udi == NULL) - goto out; - -- dbus_error_init (&error); - if ((ctx = libhal_ctx_init_direct (&error)) == NULL) - goto out; - -diff --git a/hald/linux/probing/probe-net-bluetooth.c b/hald/linux/probing/probe-net-bluetooth.c -index 0b1b912..e911eea 100644 ---- a/hald/linux/probing/probe-net-bluetooth.c -+++ b/hald/linux/probing/probe-net-bluetooth.c -@@ -141,6 +141,8 @@ main (int argc, char *argv[]) - DBusMessage *reply = NULL; - DBusError error; - -+ dbus_error_init (&error); -+ - udi = getenv ("UDI"); - if (udi == NULL) - goto out; -@@ -151,8 +153,6 @@ main (int argc, char *argv[]) - - HAL_INFO (("Investigating '%s'", iface)); - -- dbus_error_init (&error); -- - if ((conn = dbus_bus_get (DBUS_BUS_SYSTEM, &error)) == NULL) - goto out; - -diff --git a/hald/linux/probing/probe-printer.c b/hald/linux/probing/probe-printer.c -index 91ed7bc..7c6d1c6 100644 ---- a/hald/linux/probing/probe-printer.c -+++ b/hald/linux/probing/probe-printer.c -@@ -66,6 +66,8 @@ main (int argc, char *argv[]) - ret = 1; - - setup_logger (); -+ -+ dbus_error_init (&error); - - udi = getenv ("UDI"); - if (udi == NULL) { -@@ -73,7 +75,6 @@ main (int argc, char *argv[]) - goto out; - } - -- dbus_error_init (&error); - if ((ctx = libhal_ctx_init_direct (&error)) == NULL) { - HAL_ERROR (("ctx init failed")); - goto out; -diff --git a/hald/linux/probing/probe-smbios.c b/hald/linux/probing/probe-smbios.c -index 0bc9689..15c0d4f 100644 ---- a/hald/linux/probing/probe-smbios.c -+++ b/hald/linux/probing/probe-smbios.c -@@ -129,6 +129,8 @@ main (int argc, char *argv[]) - ret = 1; - - setup_logger (); -+ -+ dbus_error_init (&error); - - udi = getenv ("UDI"); - if (udi == NULL) { -@@ -136,7 +138,6 @@ main (int argc, char *argv[]) - goto out; - } - -- dbus_error_init (&error); - if ((ctx = libhal_ctx_init_direct (&error)) == NULL) { - HAL_ERROR (("ctx init failed")); - goto out; -diff --git a/hald/linux/probing/probe-storage.c b/hald/linux/probing/probe-storage.c -index 824a82e..dd524ca 100644 ---- a/hald/linux/probing/probe-storage.c -+++ b/hald/linux/probing/probe-storage.c -@@ -109,6 +109,8 @@ main (int argc, char *argv[]) - /* assume failure */ - ret = 1; - -+ dbus_error_init (&error); -+ - if ((udi = getenv ("UDI")) == NULL) - goto out; - if ((device_file = getenv ("HAL_PROP_BLOCK_DEVICE")) == NULL) -@@ -127,7 +129,6 @@ main (int argc, char *argv[]) - else - only_check_for_fs = FALSE; - -- dbus_error_init (&error); - if ((ctx = libhal_ctx_init_direct (&error)) == NULL) - goto out; - -diff --git a/hald/linux/probing/probe-video4linux.c b/hald/linux/probing/probe-video4linux.c -index cf913c0..7bc13e8 100644 ---- a/hald/linux/probing/probe-video4linux.c -+++ b/hald/linux/probing/probe-video4linux.c -@@ -58,6 +58,8 @@ main (int argc, char *argv[]) - - setup_logger (); - -+ dbus_error_init (&error); -+ - device_file = getenv ("HAL_PROP_VIDEO4LINUX_DEVICE"); - if (device_file == NULL) - goto out; -@@ -66,7 +68,6 @@ main (int argc, char *argv[]) - if (udi == NULL) - goto out; - -- dbus_error_init (&error); - ctx = libhal_ctx_init_direct (&error); - if (ctx == NULL) - goto out; -diff --git a/hald/linux/probing/probe-volume.c b/hald/linux/probing/probe-volume.c -index 0de1b91..7268fff 100644 ---- a/hald/linux/probing/probe-volume.c -+++ b/hald/linux/probing/probe-volume.c -@@ -318,6 +318,8 @@ main (int argc, char *argv[]) - /* assume failure */ - ret = 1; - -+ dbus_error_init (&error); -+ - if ((udi = getenv ("UDI")) == NULL) - goto out; - if ((device_file = getenv ("HAL_PROP_BLOCK_DEVICE")) == NULL) -@@ -346,7 +348,6 @@ main (int argc, char *argv[]) - - fsusage = getenv ("HAL_PROP_VOLUME_FSUSAGE"); - -- dbus_error_init (&error); - if ((ctx = libhal_ctx_init_direct (&error)) == NULL) - goto out; - --- -cgit v0.8.3-6-g21f6 diff --git a/arch/3.5.13/trinity-base/hal/patches/fix-libusb-detection.patch b/arch/3.5.13/trinity-base/hal/patches/fix-libusb-detection.patch deleted file mode 100644 index d4f966dec..000000000 --- a/arch/3.5.13/trinity-base/hal/patches/fix-libusb-detection.patch +++ /dev/null @@ -1,66 +0,0 @@ -From fce91df8ba7f305c624baf1f06961c040b088ecc Mon Sep 17 00:00:00 2001 -From: Joe Marcus Clarke <marcus@FreeBSD.org> -Date: Tue, 08 Dec 2009 00:05:27 +0000 -Subject: Fix libusb detection on Linux - -Adjust the FreeBSD libusb20 code so that it does not interfere with the -Linux libusb detection. - -Reported by: Robby Workman <rw@rlworkman.net> ---- -diff --git a/configure.in b/configure.in -index a8fda51..8363595 100644 ---- a/configure.in -+++ b/configure.in -@@ -479,9 +479,6 @@ if test "x$with_libpci" != xno ; then - fi - AM_CONDITIONAL([HAVE_LIBPCI], [test "x$USE_LIBPCI" = "xyes"]) - --USE_LIBUSB20=no --USE_LIBUSB=no --LIBUSB20_LIBS="" - AC_ARG_WITH([backend], - AS_HELP_STRING([--with-backend=<name>], - [backend to use (linux/solaris/freebsd/dummy)]), -@@ -510,21 +507,25 @@ AM_CONDITIONAL(HALD_COMPILE_FREEBSD, [test x$HALD_BACKEND = xfreebsd], [Compilin - AM_CONDITIONAL(HALD_COMPILE_SOLARIS, [test x$HALD_BACKEND = xsolaris], [Compiling for Solaris]) - AC_SUBST(HALD_BACKEND) - if test "x$HALD_BACKEND" = "xfreebsd"; then -- AC_CHECK_LIB([usb20], [libusb20_dev_get_info], [USE_LIBUSB20=yes], [USE_LIBUSB20=no]) --fi --if test "x$USE_LIBUSB20" = "xno"; then -- AC_CHECK_LIB([usb], [libusb20_dev_get_info], [USE_LIBUSB=yes], [USE_LIBUSB=no]) --fi --AM_CONDITIONAL([HAVE_LIBUSB20],[test "x$USE_LIBUSB20" = "xyes"]) --AM_CONDITIONAL([HAVE_LIBUSB20],[test "x$USE_LIBUSB" = "xyes"]) --if test "x$USE_LIBUSB20" = "xyes"; then -- AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libusb20]) -- LIBUSB20_LIBS="-lusb20" --elif test "x$USE_LIBUSB" = "xyes"; then -- AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libsub20]) -- LIBUSB20_LIBS="-lusb" -+ USE_BSDLIBUSB20=no -+ USE_BSDLIBUSB=no -+ LIBUSB20_LIBS="" -+ AC_CHECK_LIB([usb20], [libusb20_dev_get_info], [USE_BSDLIBUSB20=yes], [USE_BSDLIBUSB20=no]) -+ if test "x$USE_BSDLIBUSB20" = "xno"; then -+ AC_CHECK_LIB([usb], [libusb20_dev_get_info], [USE_BSDLIBUSB=yes], [USE_BSDLIBUSB=no]) -+ fi -+ AM_CONDITIONAL([HAVE_LIBUSB20],[test "x$USE_BSDLIBUSB20" = "xyes" -o "x$USE_BSDLIBUSB" = "xyes"]) -+ if test "x$USE_BSDLIBUSB20" = "xyes"; then -+ AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libusb20]) -+ LIBUSB20_LIBS="-lusb20" -+ elif test "x$USE_BSDLIBUSB" = "xyes"; then -+ AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libsub20]) -+ LIBUSB20_LIBS="-lusb" -+ fi -+ AC_SUBST(LIBUSB20_LIBS) -+else -+ AM_CONDITIONAL([HAVE_LIBUSB20], [false]) - fi --AC_SUBST(LIBUSB20_LIBS) - - dnl DBUS API is subject to changes - AC_DEFINE_UNQUOTED(DBUS_API_SUBJECT_TO_CHANGE, [], [DBUS API is subject to change]) --- -cgit v0.8.3-6-g21f6 diff --git a/arch/3.5.13/trinity-base/hal/patches/hal-0.5.9-hide-diagnostic.patch b/arch/3.5.13/trinity-base/hal/patches/hal-0.5.9-hide-diagnostic.patch deleted file mode 100644 index 58c882d77..000000000 --- a/arch/3.5.13/trinity-base/hal/patches/hal-0.5.9-hide-diagnostic.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- hal-0.5.9/fdi/policy/10osvendor/20-storage-methods.fdi.orig 2007-05-01 21:39:31.000000000 +0000 -+++ hal-0.5.9/fdi/policy/10osvendor/20-storage-methods.fdi 2007-05-01 21:51:14.000000000 +0000 -@@ -100,6 +100,11 @@ - </match> - </match> - -+ <!-- Hide partitions marked as Compaq Diagnostics --> -+ <match key="volume.partition.type" string="0x12"> -+ <merge key="volume.ignore" type="bool">true</merge> -+ </match> -+ - <!-- EFI firmware partitions --> - <match key="volume.fstype" string="vfat"> - <match key="volume.label" string="EFI"> diff --git a/arch/3.5.13/trinity-base/hal/patches/hal-HDAPS-blacklist.patch b/arch/3.5.13/trinity-base/hal/patches/hal-HDAPS-blacklist.patch deleted file mode 100644 index 8a6822817..000000000 --- a/arch/3.5.13/trinity-base/hal/patches/hal-HDAPS-blacklist.patch +++ /dev/null @@ -1,30 +0,0 @@ -From e1f85fe0cdfa7e4d4ce7a811d0b0c90bf38fba0c Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter.hutterer@who-t.net> -Date: Thu, 25 Jun 2009 09:47:27 +1000 -Subject: [PATCH] Blacklist HDAPS accelerometer device from being picked up in X. - -This device posts accelerometer data through ABS_X/ABS_Y, making X unusable -if it's controlling the pointer. ---- - fdi/policy/10osvendor/10-x11-input.fdi | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -diff --git a/fdi/policy/10osvendor/10-x11-input.fdi b/fdi/policy/10osvendor/10-x11-input.fdi -index a342421..89ba672 100644 ---- a/fdi/policy/10osvendor/10-x11-input.fdi -+++ b/fdi/policy/10osvendor/10-x11-input.fdi -@@ -38,5 +38,11 @@ - <merge key="input.x11_driver" type="string">evdev</merge> - </match> - </match> -+ -+ <!-- http://bugs.freedesktop.org/show_bug.cgi?id=22442 -+ Posts accel data through ABS_X/ABS_Y, makes X unusable --> -+ <match key="info.product" contains="ThinkPad HDAPS accelerometer data"> -+ <remove key="input.x11_driver" /> -+ </match> - </device> - </deviceinfo> --- -1.6.3.rc1.2.g0164.dirty - diff --git a/arch/3.5.13/trinity-base/hal/patches/hal-KVM-evdev.patch b/arch/3.5.13/trinity-base/hal/patches/hal-KVM-evdev.patch deleted file mode 100644 index 917655ed1..000000000 --- a/arch/3.5.13/trinity-base/hal/patches/hal-KVM-evdev.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 7618498eec840cb26474dc47821e083957772706 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter.hutterer@who-t.net> -Date: Fri, 20 Mar 2009 14:37:24 +1000 -Subject: [PATCH] Add x11_driver for American Megatrends KVM. - -This device exposes only ABS_X, ABS_Y and buttons. It gets input.joystick -assigned but not input.mouse, hence the default evdev mapping doesn't pick up -on it. - -Red Hat Bug 484776 <https://bugzilla.redhat.com/show_bug.cgi?id=484776> - -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - fdi/policy/10osvendor/10-x11-input.fdi | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -diff --git a/fdi/policy/10osvendor/10-x11-input.fdi b/fdi/policy/10osvendor/10-x11-input.fdi -index 769f75b..eb9767e 100644 ---- a/fdi/policy/10osvendor/10-x11-input.fdi -+++ b/fdi/policy/10osvendor/10-x11-input.fdi -@@ -2,6 +2,12 @@ - <deviceinfo version="0.2"> - <device> - -+ <!-- This KVMS has abs x/y and buttons. It only has inputInfo.joystick -+ set by hal and doesn't get picked up by default --> -+ <match key="input.product" contains="American Megatrends Inc. Virtual Keyboard and Mouse"> -+ <merge key="input.x11_driver" type="string">evdev</merge> -+ </match> -+ - <!-- KVM emulates a USB graphics tablet which works in absolute coordinate mode --> - <match key="input.product" contains="QEMU USB Tablet"> - <merge key="input.x11_driver" type="string">evdev</merge> --- -1.6.0.6 - diff --git a/arch/3.5.13/trinity-base/hal/patches/hal-ignore-internal-dm-devices.patch b/arch/3.5.13/trinity-base/hal/patches/hal-ignore-internal-dm-devices.patch deleted file mode 100644 index 9ad8656ca..000000000 --- a/arch/3.5.13/trinity-base/hal/patches/hal-ignore-internal-dm-devices.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 6f16321da13f6a7cbd9c424ddba2e727e434fa25 Mon Sep 17 00:00:00 2001 -From: Milan Broz <mbroz@redhat.com> -Date: Tue, 13 Jul 2010 14:07:32 +0000 -Subject: HAL: Ignore internal DM devices with new DM udev rules - -With new device-mapper udev rules are /dev/mapper/* symlinks -to basic device name /dev/dm-X. -(Change requested by udev upstream.) - -This change breaks temporary-cryptsetup workaround inside hal. - -With new dm-udev rules (uncluded since device-mapper 1.02.39) -there is DM_UDEV_DISABLE_OTHER_RULES_FLAG variable -which controls that scan should be ignored for this device -(it is set for all internal devices, including temporary cryptsetup, -internal parts of lvm devices etc.) - -Ignore device if this flag is set. - -See bugs -https://bugzilla.redhat.com/show_bug.cgi?id=613909 -http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=586286 - -Signed-off-by: Milan Broz <mbroz@redhat.com> ---- -diff --git a/hald/linux/osspec.c b/hald/linux/osspec.c -index a8233fd..6d616bc 100644 ---- a/hald/linux/osspec.c -+++ b/hald/linux/osspec.c -@@ -215,6 +215,11 @@ hald_udev_data (GIOChannel *source, GIOCondition condition, gpointer user_data) - g_free (str); - } - g_free (dstr); -+ } else if (strncmp(key, "DM_UDEV_DISABLE_OTHER_RULES_FLAG=", 33) == 0) { -+ if (strtoul(&key[33], NULL, 10) == 1) { -+ HAL_INFO (("ignoring device requested by DM udev rules")); -+ goto invalid; -+ } - } - } - --- -cgit v0.8.3-6-g21f6 diff --git a/arch/3.5.13/trinity-base/hal/patches/hal-remove-dell-killswitch.patch b/arch/3.5.13/trinity-base/hal/patches/hal-remove-dell-killswitch.patch deleted file mode 100644 index ae0cf7a2b..000000000 --- a/arch/3.5.13/trinity-base/hal/patches/hal-remove-dell-killswitch.patch +++ /dev/null @@ -1,201 +0,0 @@ -diff -upr hal-0.5.12/tools/linux/hal-system-killswitch-get-power-linux hal-0.5.12.new/tools/linux/hal-system-killswitch-get-power-linux ---- hal-0.5.12/tools/linux/hal-system-killswitch-get-power-linux 2008-08-22 07:34:47.000000000 +0100 -+++ hal-0.5.12.new/tools/linux/hal-system-killswitch-get-power-linux 2009-03-03 10:45:20.000000000 +0000 -@@ -8,11 +8,6 @@ - # the Free Software Foundation; either version 2 of the License, or - # (at your option) any later version. - --DELL_WCTL=/usr/bin/dellWirelessCtl --if [ -x "/usr/sbin/dellWirelessCtl" ]; then -- DELL_WCTL=/usr/sbin/dellWirelessCtl --fi -- - if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then - if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "sonypic" ]; then - value="`hal-system-sonypic getbluetooth`" -@@ -22,25 +17,6 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "blue - exit 1 - fi - exit ${value} -- elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then -- if [ -x "$DELL_WCTL" ]; then -- # TODO: write our own binary that links with libsmbios? -- $DELL_WCTL --st_bt -- value=$? -- if [ "$value" = "0" ]; then -- exit 1 -- elif [ "$value" = "1" ]; then -- exit 0 -- else -- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 -- echo "dellWirelessCtl returned $value" >&2 -- exit 1 -- fi -- else -- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 -- echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2 -- exit 1 -- fi - elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = thinkpad -a -r "$HAL_PROP_LINUX_SYSFS_PATH" ]; then - read value < $HAL_PROP_LINUX_SYSFS_PATH 2> /dev/null - if [ $? -eq 0 ]; then -@@ -55,56 +31,6 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "blue - echo "Access type not supported" >&2 - exit 1 - fi --elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wlan" ]; then -- if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then -- if [ -x "$DELL_WCTL" ]; then -- # TODO: write our own binary that links with libsmbios? -- $DELL_WCTL --st_wlan -- value=$? -- if [ "$value" = "0" ]; then -- exit 1 -- elif [ "$value" = "1" ]; then -- exit 0 -- else -- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 -- echo "dellWirelessCtl returned $value" >&2 -- exit 1 -- fi -- else -- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 -- echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2 -- exit 1 -- fi -- else -- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 -- echo "Access type not supported" >&2 -- exit 1 -- fi --elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wwan" ]; then -- if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then -- if [ -x "$DELL_WCTL" ]; then -- # TODO: write our own binary that links with libsmbios? -- $DELL_WCTL --st_wwan -- value=$? -- if [ "$value" = "0" ]; then -- exit 1 -- elif [ "$value" = "1" ]; then -- exit 0 -- else -- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 -- echo "dellWirelessCtl returned $value" >&2 -- exit 1 -- fi -- else -- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 -- echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2 -- exit 1 -- fi -- else -- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 -- echo "Access type not supported" >&2 -- exit 1 -- fi - else - echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 - echo "Killswitch type not supported" >&2 -diff -upr hal-0.5.12/tools/linux/hal-system-killswitch-set-power-linux hal-0.5.12.new/tools/linux/hal-system-killswitch-set-power-linux ---- hal-0.5.12/tools/linux/hal-system-killswitch-set-power-linux 2008-10-24 09:45:54.000000000 +0100 -+++ hal-0.5.12.new/tools/linux/hal-system-killswitch-set-power-linux 2009-03-03 10:44:49.000000000 +0000 -@@ -8,11 +8,6 @@ - # the Free Software Foundation; either version 2 of the License, or - # (at your option) any later version. - --DELL_WCTL=/usr/bin/dellWirelessCtl --if [ -x "/usr/sbin/dellWirelessCtl" ]; then -- DELL_WCTL=/usr/sbin/dellWirelessCtl --fi -- - if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then - if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "sonypic" ]; then - hal-system-sonypic setbluetooth $value -@@ -23,26 +18,6 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "blue - exit 1 - fi - exit 0 -- elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then -- if [ -x "$DELL_WCTL" ]; then -- # TODO: write our own binary that links with libsmbios? -- if [ "$value" = "true" ]; then -- $DELL_WCTL --bt 1 -- ret=$? -- else -- $DELL_WCTL --bt 0 -- ret=$? -- fi -- if [ "$ret" != "0" ]; then -- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 -- echo "dellWirelessCtl returned $ret" >&2 -- exit 1 -- fi -- else -- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 -- echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2 -- exit 1 -- fi - elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = thinkpad -a -w "$HAL_PROP_LINUX_SYSFS_PATH" ]; then - if [ "$value" = "true" ]; then - bit=1; -@@ -61,60 +36,6 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "blue - echo "Access type not supported" >&2 - exit 1 - fi --elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wlan" ]; then -- if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then -- if [ -x "$DELL_WCTL" ]; then -- # As a side effect we disable the physical kill switch -- # TODO: write our own binary that links with libsmbios? -- if [ "$value" = "true" ]; then -- $DELL_WCTL --sw_wlan 0 --wlan 1 -- ret=$? -- else -- $DELL_WCTL --sw_wlan 0 --wlan 0 -- ret=$? -- fi -- if [ "$ret" != "0" ]; then -- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 -- echo "dellWirelessCtl returned $ret" >&2 -- exit 1 -- fi -- else -- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 -- echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2 -- exit 1 -- fi -- else -- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 -- echo "Access type not supported" >&2 -- exit 1 -- fi --elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wwan" ]; then -- if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then -- if [ -x "$DELL_WCTL" ]; then -- # As a side effect we disable the physical kill switch -- # TODO: write our own binary that links with libsmbios? -- if [ "$value" = "true" ]; then -- $DELL_WCTL --sw_wwan 0 --wwan 1 -- ret=$? -- else -- $DELL_WCTL --sw_wwan 0 --wwan 0 -- ret=$? -- fi -- if [ "$ret" != "0" ]; then -- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 -- echo "dellWirelessCtl returned $ret" >&2 -- exit 1 -- fi -- else -- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 -- echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2 -- exit 1 -- fi -- else -- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 -- echo "Access type not supported" >&2 -- exit 1 -- fi - else - echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 - echo "Killswitch type not supported" >&2 diff --git a/arch/3.5.13/trinity-base/hal/patches/hal-use-at-console.patch b/arch/3.5.13/trinity-base/hal/patches/hal-use-at-console.patch deleted file mode 100644 index 0b32f17f0..000000000 --- a/arch/3.5.13/trinity-base/hal/patches/hal-use-at-console.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -up hal-0.5.13/hal.conf.in.drop-polkit hal-0.5.13/hal.conf.in ---- hal-0.5.13/hal.conf.in.drop-polkit 2009-02-04 17:07:23.000000000 -0500 -+++ hal-0.5.13/hal.conf.in 2009-07-29 23:15:16.866766074 -0400 -@@ -25,7 +25,41 @@ - send_interface="org.freedesktop.Hal.Device"/> - <allow send_destination="org.freedesktop.Hal" - send_interface="org.freedesktop.Hal.Manager"/> -+ </policy> -+ -+ <!-- Only allow users at the local console to manipulate devices --> -+ <policy at_console="true"> -+ <allow send_destination="org.freedesktop.Hal" -+ send_interface="org.freedesktop.Hal.Device.CPUFreq"/> -+ <allow send_destination="org.freedesktop.Hal" -+ send_interface="org.freedesktop.Hal.Device.DockStation"/> -+ <allow send_destination="org.freedesktop.Hal" -+ send_interface="org.freedesktop.Hal.Device.KillSwitch"/> -+ <allow send_destination="org.freedesktop.Hal" -+ send_interface="org.freedesktop.Hal.Device.KeyboardBacklight"/> -+ <allow send_destination="org.freedesktop.Hal" -+ send_interface="org.freedesktop.Hal.Device.LaptopPanel"/> -+ <allow send_destination="org.freedesktop.Hal" -+ send_interface="org.freedesktop.Hal.Device.Leds"/> -+ <allow send_destination="org.freedesktop.Hal" -+ send_interface="org.freedesktop.Hal.Device.LightSensor"/> -+ <allow send_destination="org.freedesktop.Hal" -+ send_interface="org.freedesktop.Hal.Device.Storage"/> -+ <allow send_destination="org.freedesktop.Hal" -+ send_interface="org.freedesktop.Hal.Device.Storage.Removable"/> -+ <allow send_destination="org.freedesktop.Hal" -+ send_interface="org.freedesktop.Hal.Device.SystemPowerManagement"/> -+ <allow send_destination="org.freedesktop.Hal" -+ send_interface="org.freedesktop.Hal.Device.Volume"/> -+ <allow send_destination="org.freedesktop.Hal" -+ send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/> -+ <allow send_destination="org.freedesktop.Hal" -+ send_interface="org.freedesktop.Hal.Device.WakeOnLan"/> -+ -+ </policy> - -+ <!-- well,...and root too --> -+ <policy user="root"> - <allow send_destination="org.freedesktop.Hal" - send_interface="org.freedesktop.Hal.Device.CPUFreq"/> - <allow send_destination="org.freedesktop.Hal" diff --git a/arch/3.5.13/trinity-base/hal/patches/hal-xen-unignore-axes.patch b/arch/3.5.13/trinity-base/hal/patches/hal-xen-unignore-axes.patch deleted file mode 100644 index b248639b7..000000000 --- a/arch/3.5.13/trinity-base/hal/patches/hal-xen-unignore-axes.patch +++ /dev/null @@ -1,39 +0,0 @@ -From e48f59d2b9bcb43ea8a7b8c884dcb73c8f65b170 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter.hutterer@who-t.net> -Date: Mon, 19 Oct 2009 14:27:20 +1000 -Subject: [PATCH] Un-ignore absolute axes for the Xen Virtual Pointer. - -The evdev-internal axis type picking fails for the Xen Virtual Pointer as it -exposes both relative and absolute axes. Evdev picks the relative axes by -default, leading to a immovable pointer if the Xen backend only sends -absolute coordinates. - -Explicitly tell evdev to not ignore the absolute axes. - -https://bugzilla.redhat.com/show_bug.cgi?id=523914 - -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - fdi/policy/10osvendor/10-x11-input.fdi | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) - -diff --git a/fdi/policy/10osvendor/10-x11-input.fdi b/fdi/policy/10osvendor/10-x11-input.fdi -index 89ba672..752c4ab 100644 ---- a/fdi/policy/10osvendor/10-x11-input.fdi -+++ b/fdi/policy/10osvendor/10-x11-input.fdi -@@ -44,5 +44,12 @@ - <match key="info.product" contains="ThinkPad HDAPS accelerometer data"> - <remove key="input.x11_driver" /> - </match> -+ -+ <!-- https://bugzilla.redhat.com/show_bug.cgi?id=523914 -+ Mouse does not move in PV Xen guest --> -+ <match key="info.product" contains="Xen Virtual Pointer"> -+ <merge key="input.x11_options.IgnoreAbsoluteAxes" type="string">false</merge> -+ <merge key="input.x11_options.IgnoreRelativeAxes" type="string">false</merge> -+ </match> - </device> - </deviceinfo> --- -1.6.2.5 - diff --git a/arch/3.5.13/trinity-base/hal/patches/handle-input-touchpad.patch b/arch/3.5.13/trinity-base/hal/patches/handle-input-touchpad.patch deleted file mode 100644 index 9cd646422..000000000 --- a/arch/3.5.13/trinity-base/hal/patches/handle-input-touchpad.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 6dccf8e3ad181e8f56b1d2a994ec50a1953a1c2d Mon Sep 17 00:00:00 2001 -From: Michael Witten <mfwitten@gmail.com> -Date: Wed, 06 Jan 2010 00:53:17 +0000 -Subject: Policy: handle `input.touchpad' explicitly - -This commit essentially duplicates the policy for: - - <match key="info.capabilities" contains="input.mouse"> - -and then changes `input.mouse' to `input.touchpad'. This -is necessary because in Linus Torvalds's Linux repo: - - git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git - -the following commit: - - commit 7105d2ea73e1391b681d0e1212c42f561c64d429 - Author: Dmitry Torokhov <dmitry.torokhov@gmail.com> - Date: Fri Dec 11 23:54:54 2009 -0800 - - Input: ALPS - do not set REL_X/REL_Y capabilities on the touchpad - - Relative events are only reported via secondary device therefore device - associated with the touchpad should not advertise these capabilities. - - Signed-off-by: Dmitry Torokhov <dtor@mail.ru> - -made these few changes: - - diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c - index a3f492a..b03e7e0 100644 - /--- a/drivers/input/mouse/alps.c - /+++ b/drivers/input/mouse/alps.c - /@@ -487,6 +487,17 @@ int alps_init(struct psmouse *psmouse) - if (alps_hw_init(psmouse)) - goto init_fail; - - + /* - + * Undo part of setup done for us by psmouse core since touchpad - + * is not a relative device. - + */ - + __clear_bit(EV_REL, dev1->evbit); - + __clear_bit(REL_X, dev1->relbit); - + __clear_bit(REL_Y, dev1->relbit); - + - + /* - + * Now set up our capabilities. - + */ - dev1->evbit[BIT_WORD(EV_KEY)] |= BIT_MASK(EV_KEY); - dev1->keybit[BIT_WORD(BTN_TOUCH)] |= BIT_MASK(BTN_TOUCH); - dev1->keybit[BIT_WORD(BTN_TOOL_FINGER)] |= BIT_MASK(BTN_TOOL_FINGER); - -so that HAL no longer adds: - - input.mouse - -to an ALPS touchpad's: - - info.capabilities - -so that HAL no longer marks the ALPS touchpad with: - - input.x11_driver = 'evdev' - -because the policy file: - - fdi/policy/10osvendor/10-x11-input.fdi - -doesn't define the policy for: - - <match key="info.capabilities" contains="input.touchpad"> - -which was previous unnecessary because everything used to -be caught by the policy for: - - <match key="info.capabilities" contains="input.mouse"> - -Signed-off-by: Michael Witten <mfwitten@gmail.com> -Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com> ---- -diff --git a/fdi/policy/10osvendor/10-x11-input.fdi b/fdi/policy/10osvendor/10-x11-input.fdi -index cff8fc5..8bbe263 100644 ---- a/fdi/policy/10osvendor/10-x11-input.fdi -+++ b/fdi/policy/10osvendor/10-x11-input.fdi -@@ -16,6 +16,14 @@ - </match> - </match> - -+ <match key="info.capabilities" contains="input.touchpad"> -+ <merge key="input.x11_driver" type="string">mouse</merge> -+ <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" -+ string="Linux"> -+ <merge key="input.x11_driver" type="string">evdev</merge> -+ </match> -+ </match> -+ - <match key="info.capabilities" contains="input.tablet"> - <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" - string="Linux"> --- -cgit v0.8.3-6-g21f6 diff --git a/arch/3.5.13/trinity-base/hal/patches/macbook-fix-ioperm.patch b/arch/3.5.13/trinity-base/hal/patches/macbook-fix-ioperm.patch deleted file mode 100644 index 14d0b392d..000000000 --- a/arch/3.5.13/trinity-base/hal/patches/macbook-fix-ioperm.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 597c1ffffd61a15a334ce42f2a569c59f0270bcb Mon Sep 17 00:00:00 2001 -From: Dmitry Torokhov <dmitry.torokhov@gmail.com> -Date: Thu, 25 Feb 2010 10:25:18 +0000 -Subject: Fix incorrect arguments to ioperm() call - -The second argument of ioperm() is not the last port to be accessed -but rather length of the port range [port, port + len). - -Signed-off-by: Dmitry Torokhov <dtor@mail.ru> -Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com> ---- -diff --git a/hald/linux/addons/addon-imac-backlight.c b/hald/linux/addons/addon-imac-backlight.c -index e869192..54e4ea3 100644 ---- a/hald/linux/addons/addon-imac-backlight.c -+++ b/hald/linux/addons/addon-imac-backlight.c -@@ -158,7 +158,8 @@ main (int argc, char **argv) - goto out; - } - -- if (ioperm(0xB2, 0xB3, 1) < 0) -+ /* Allow access to ports 0xB2 and 0xB3 */ -+ if (ioperm(0xB2, 2, 1) < 0) - { - HAL_ERROR (("ioperm failed (you should be root).")); - exit(1); -diff --git a/hald/linux/addons/addon-macbookpro-backlight.c b/hald/linux/addons/addon-macbookpro-backlight.c -index 2a6fef6..c1bbbac 100644 ---- a/hald/linux/addons/addon-macbookpro-backlight.c -+++ b/hald/linux/addons/addon-macbookpro-backlight.c -@@ -507,7 +507,8 @@ main (int argc, char *argv[]) - state = INREG(0x7ae4); - OUTREG(0x7ae4, state); - -- if (ioperm (0x300, 0x304, 1) < 0) { -+ /* Allow access to porta 0x300 through 0x304 */ -+ if (ioperm (0x300, 5, 1) < 0) { - HAL_ERROR (("ioperm failed (you should be root).")); - exit(1); - } --- -cgit v0.8.3-6-g21f6 diff --git a/arch/3.5.13/trinity-base/hal/patches/path-max.patch b/arch/3.5.13/trinity-base/hal/patches/path-max.patch deleted file mode 100644 index 304185d7d..000000000 --- a/arch/3.5.13/trinity-base/hal/patches/path-max.patch +++ /dev/null @@ -1,31 +0,0 @@ -From a2c3dd5a04d79265772c09c4280606d5c2ed72c6 Mon Sep 17 00:00:00 2001 -From: Martin Pitt <martin.pitt@ubuntu.com> -Date: Mon, 04 Jan 2010 15:56:13 +0000 -Subject: Bump HAL_PATH_MAX to 4096 - -Some bits in the code use realpath() with destination paths of size -HAL_PATH_MAX. This potentially breaks on systems where PATH_MAX is bigger than -HAL_PATH_MAX (which was 512 until now). - -Since we can't use PATH_MAX directly (due to platforms like GNU/Hurd, which -apparently don't have it), just bump HAL_PATH_MAX to 4096 (as PATH_MAX is on -Linux), to avoid potential buffer overflows and also fix hal on Linux when -enabling FORTIFY in gcc. - -https://bugs.freedesktop.org/show_bug.cgi?id=25888 ---- -diff --git a/hald/util.h b/hald/util.h -index c2a1584..7883333 100644 ---- a/hald/util.h -+++ b/hald/util.h -@@ -38,7 +38,7 @@ - #endif - - #define HAL_NAME_MAX 256 --#define HAL_PATH_MAX 512 -+#define HAL_PATH_MAX 4096 - - gboolean hal_util_remove_trailing_slash (gchar *path); - --- -cgit v0.8.3-6-g21f6 diff --git a/arch/3.5.13/trinity-base/trinity-arts/PKGBUILD b/arch/3.5.13/trinity-base/trinity-arts/PKGBUILD index 123ef247a..6e8d65267 100644 --- a/arch/3.5.13/trinity-base/trinity-arts/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-arts/PKGBUILD @@ -28,8 +28,8 @@ build() { # Do we need this? msg "Setting PATH, CMAKE and Trinity Environment variables" - # This should be done on system startup, neverthless, do it to be sure. - . /etc/profile.d/qt3.sh + # Source the QT and KDE profile + [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh cd $srcdir msg "Creating out-of-source build directory: ${srcdir}/build" diff --git a/arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD b/arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD index a3c090630..fb68f2239 100644 --- a/arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD @@ -14,36 +14,35 @@ makedepends=('pkgconfig' 'cmake') options=('libtool' '!strip') source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/dependencies/dbus-tqt-3.5.13.tar.gz) md5sums=('46ae165c068271485c827f6fc6687a9a') - -_prefix="/opt/trinity" +install='trinity-dbus-tqt.install' build() { - msg "Setting PATH, CMAKE and Trinity Environment variables" - . /etc/profile.d/qt3.sh - . /etc/profile.d/trinity.sh + msg "Setting PATH, CMAKE and Trinity Environment variables" + # Source the QT and TDE profile + [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh + [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh - #export CMAKE_PREFIX_PATH=${QTDIR}:${_prefix} - #export CMAKE_INCLUDE_PATH=/usr/include/dbus-1.0:${_prefix}/include:${_prefix}/include/libkrandr - #export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH - #export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig + #export CMAKE_PREFIX_PATH=${QTDIR}:${TDEDIR} + #export CMAKE_INCLUDE_PATH=/usr/include/dbus-1.0:${TDEDIR}/include:${TDEDIR}/include/libkrandr + #export LD_LIBRARY_PATH=${TDEDIR}/lib:${TDEDIR}/lib/trinity:$LD_LIBRARY_PATH + #export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${QTDIR}/lib/pkgconfig - cd $srcdir - msg "Creating out-of-source build directory: ${srcdir}/build" - mkdir -p build - cd build + cd $srcdir + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p build + cd build - msg "Starting cmake..." - cmake ${srcdir}/dependencies/dbus-tqt \ - -DCMAKE_INSTALL_PREFIX=${_prefix} \ - -DCMAKE_VERBOSE_MAKEFILE=ON + msg "Starting cmake..." + cmake ${srcdir}/dependencies/dbus-tqt \ + -DCMAKE_INSTALL_PREFIX=$TDEDIR - msg "Building - $pkgname..." - make + msg "Building - $pkgname..." + make } package() { - msg "Packaging - $pkgname-$pkgver" - cd ${srcdir}/build - make DESTDIR="${pkgdir}" install + msg "Packaging - $pkgname-$pkgver" + cd ${srcdir}/build + make DESTDIR="${pkgdir}" install } diff --git a/arch/3.5.13/trinity-base/trinity-dbus-tqt/trinity-dbus-tqt.install b/arch/3.5.13/trinity-base/trinity-dbus-tqt/trinity-dbus-tqt.install new file mode 100644 index 000000000..2a8dc4c98 --- /dev/null +++ b/arch/3.5.13/trinity-base/trinity-dbus-tqt/trinity-dbus-tqt.install @@ -0,0 +1,12 @@ +post_install() { + ldconfig &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD b/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD index 7f0b2ea02..657b674ec 100644 --- a/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD @@ -3,52 +3,68 @@ pkgname=trinity-kdebase pkgver=3513 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url='http://www.trinitydesktop.org' license=('GPL') groups=('trinity-base') pkgdesc="Trinity Desktop Enviroment base components" depends=('trinity-dbus-tqt' 'trinity-kdelibs' 'hal' - 'xorg-server' 'xorg-xset' 'xorg-xsetroot' 'xorg-xprop' 'xorg-xmessage' 'xorg-xinit' - 'xorg-iceauth' + 'xorg-server' 'xorg-xset' 'xorg-xsetroot' 'xorg-xprop' 'xorg-xmessage' 'xorg-xinit' 'xorg-iceauth' 'libxtst') - - #'trinity-dbus-1-qt3' 'trinity-pyqt3' 'trinity-dbus-tqt-1' # 'libltdl' # 'openexr' # 'libxkbfile' makedepends=('pkgconfig' 'cmake' 'autoconf' 'imake' 'xorg-bdftopcf') optdepends=('desktop-file-utils: Command line utilities for working with desktop entries' - 'pciutils: PCI bus configuration space access library and tools' - 'xscreensaver: Screen saver and locker for the X Window System' - 'xorg-fonts-75dpi: X.org 75dpi fonts collection') + 'pciutils: PCI bus configuration space access library and tools' + 'xscreensaver: Screen saver and locker for the X Window System' + 'xorg-fonts-75dpi: X.org 75dpi fonts collection') confilicts=('kdemod3-kdebase') options=('libtool') -source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdebase-3.5.13.tar.gz' 'docpath.patch' 'dbusfix.patch' 'kdm-trinity' 'trinity.desktop' 'Xsession.patch') +source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdebase-3.5.13.tar.gz' + 'patches.tar.bz2' + 'Xsession.patch' + 'arch-kdeshutdown.png' + 'kdm-default-face.png' + 'agent-shutdown.sh' + 'agent-startup.sh' + 'kdm-trinity' + 'trinity.desktop') md5sums=('d1f7e1f94eeb46b981fe1ba144179840' - 'fc9cdbe6779bb3860e222dafa744c94e' - 'c9ce810c281002440a6de8cfd8735d07' + 'bf0cc14276148d5f6bd46828367825a6' + '895f5d7351aa73ba1f57b0ad27081d69' + 'bb3004513d703d6b72ce70aa240af3a3' + 'e6afdd7ca60c4c59b851135785347e75' + '18e8d01124b19f7df2937c06e177bf7f' + 'c963ef6e37c9051119972a58c67f05fb' '376d85d213cf3c04cb0912e5cccd68bd' - '1418e45fea5a9738544cbd264c36373b' - '895f5d7351aa73ba1f57b0ad27081d69') - -_prefix="/opt/trinity" + '1418e45fea5a9738544cbd264c36373b') +install='trinity-kdebase.install' build() { - cd $srcdir + cd $srcdir/kdebase msg "Setting PATH, CMAKE and Trinity Environment variables" - . /etc/profile.d/qt3.sh + # Source the QT and TDE profile + [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh + [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh + + #export CMAKE_PREFIX_PATH=${QTDIR}:${TDEDIR} + #export CMAKE_INCLUDE_PATH=${TDEDIR}/include/dbus-1-tqt/:${TDEDIR}/include/dbus-1.0/:${TDEDIR}/include:${TDEDIR}/include/libkrandr + #export LD_LIBRARY_PATH=${TDEDIR}/lib:${TDEDIR}/lib/kde3:${QTDIR}/lib:$LD_LIBRARY_PATH + #export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${QTDIR}/lib/pkgconfig:$PKG_CONFIG_PATH - export CMAKE_PREFIX_PATH=${QTDIR}:${_prefix} - export CMAKE_INCLUDE_PATH=${_prefix}/include/dbus-1-tqt/:${_prefix}/include/dbus-1.0/:${_prefix}/include:${_prefix}/include/libkrandr - export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/kde3:${QTDIR}/lib:$LD_LIBRARY_PATH - export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig:$PKG_CONFIG_PATH + msg "Patching..." + for patch in $srcdir/patches/*.patch; do + _p=`basename $patch` + msg "Applying patch $_p.." + patch -Np0 -i $patch + done - patch -N ${srcdir}/kdebase/kioslave/media/mediamanager/halbackend.h < dbusfix.patch - patch -N -d ${srcdir} -p0 < docpath.patch + #Compatibility with kde3 and kde4 + #sed -ie 's/applications-merged/tde-applications-merged/g' applnk/CMakeLists.txt msg "Creating out-of-source build directory: ${srcdir}/build" mkdir -p build @@ -56,7 +72,7 @@ build() { msg "Starting cmake..." cmake ${srcdir}/kdebase --debug-output \ - -DCMAKE_INSTALL_PREFIX=${_prefix} \ + -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DQT_VERSION=3 \ -DSYSCONF_INSTALL_DIR=/etc \ @@ -86,39 +102,49 @@ package() { make DESTDIR="$pkgdir" install - # create/install desktop + # install X11 session file install -d -m755 ${pkgdir}/etc/X11/sessions - # echo '[Desktop Entry]' > ${pkgdir}/etc/X11/sessions/trinity.desktop - # echo 'Encoding=UTF-8' >> ${pkgdir}/etc/X11/sessions/trinity.desktop - #echo 'Type=XSession' >> ${pkgdir}/etc/X11/sessions/trinity.desktop - #echo "Exec=${_prefix}/bin/starttrinity" >> ${pkgdir}/etc/X11/sessions/trinity.desktop - #echo "TryExec=${_prefix}/bin/starttrinity" >> ${pkgdir}/etc/X11/sessions/trinity.desktop - #echo 'Name=Trinity' >> ${pkgdir}/etc/X11/sessions/trinity.desktop - #echo 'Comment=The Trinity Desktop Environment. A powerful Open Source graphical desktop environment' >> ${pkgdir}/etc/X11/sessions/trinity.desktop - #chmod 0755 ${pkgdir}/etc/X11/sessions/trinity.desktop - - # install desktop - #[[ -f ${pkgdir}/etc/X11/sessions/trinity.desktop ]] || msg "ERROR - Install Failure: ${pkgdir}/etc/X11/sessions/trinity.desktop" install -m755 ${srcdir}/trinity.desktop ${pkgdir}/etc/X11/sessions/trinity.desktop - # set kdm directory - #_kdmdir=${_prefix}/share/config/kdm - #[[ -d ${pkgdir}/${_kdmdir} ]] || install -d -m755 ${pkgdir}/${_kdmdir} - - # install kdmrc - #[[ -f kdmrc ]] && install -m644 kdmrc ${pkgdir}/${_kdmdir} - - - # update the Xsession file - # [[ -f Xsession ]] && install -m755 Xsession ${pkgdir}/${_kdmdir} - patch -N ${pkgdir}${_prefix}/share/config/kdm/Xsession < ${srcdir}/Xsession.patch + # update the Xsession file, this resolves problem with kdm dropping back + # to the login screen + patch -N ${pkgdir}${TDEDIR}/share/config/kdm/Xsession < ${srcdir}/Xsession.patch # create the starttrinity link - [[ -d ${pkgdir}/usr/bin ]] || mkdir -p ${pkgdir}/usr/bin - cd ${pkgdir}/usr/bin - ln -sf /opt/trinity/bin/startkde starttrinity + # do we need this? wouldn't be better to rename startkde script + # to starttrinity? Well, whathever. + ln -sf ${pkgdir}$TDEDIR/bin/startkde ${pkgdir}$TDEDIR/bin/starttrinity - # iinstall kdm rc.d script + # install kdm rc.d script. We need this to start kdm from rc.d install -D -m755 ${srcdir}/kdm-trinity "${pkgdir}"/etc/rc.d/kdm-trinity + + # install mkpamserv script, so we can auto-generate pam.d configs in post_install() + install -D -m755 ${srcdir}/kdebase/mkpamserv ${pkgdir}${TDEDIR}/bin/mkpamserv + + # dbus config file. I don't know if we need this, since directory listed + # in the config file doens't exist. Maybe this should be provided by dbus bindings? + # No, after riconsidering I'm not gonna provide it unless it's required. + + # Add image for default user avatar. This removes kdm complains about missing + # default avatar from kdm.log + install -D -m 644 $srcdir/kdm-default-face.png ${pkgdir}$TDEDIR/share/apps/kdm/faces/.default.face.icon + install -D -m 644 $srcdir/kdm-default-face.png ${pkgdir}$TDEDIR/share/apps/kdm/pics/users/arch-kdm.png + + # Install nice arch logo to use in the shutdown dialog + install -D -m 644 $srcdir/arch-kdeshutdown.png ${pkgdir}$TDEDIR/share/apps/ksmserver/pics/shutdownkonq.png + + # add startup/shutdown agents for ssh and gpg-agent + install -m644 -D $srcdir/agent-startup.sh ${pkgdir}$TDEDIR/env/agent-startup.sh + install -m755 -D $srcdir/agent-shutdown.sh ${pkgdir}$TDEDIR/shutdown/agent-shutdown.sh + + # fix kde icons for gnome by creating symlinks + mkdir -p ${pkgdir}$TDEDIR/share/icons/gnome/{128x128,64x64,32x32,16x16,48x48,22x22,scalable} + mkdir -p ${pkgdir}$TDEDIR/share/icons/crystalsvg/{128x128/apps,64x64/apps,32x32/apps,16x16/apps,48x48/apps,22x22/apps,scalable/apps} + cd ${pkgdir}$TDEDIR/share/icons/gnome/ + for i in *; do + cd $i + ln -sf ../../crystalsvg/$i/apps/ apps + cd .. + done } diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/agent-shutdown.sh b/arch/3.5.13/trinity-base/trinity-kdebase/agent-shutdown.sh new file mode 100644 index 000000000..71b056af3 --- /dev/null +++ b/arch/3.5.13/trinity-base/trinity-kdebase/agent-shutdown.sh @@ -0,0 +1,13 @@ +#!/bin/sh +# +# This file is executed at kde shutdown. +# Uncomment the following lines to kill the agents +# that were started at session startup. + +if [ "${GPG_AGENT_INFO}" ]; then + kill $(echo ${GPG_AGENT_INFO} | cut -d':' -f 2) >/dev/null 2>&1 +fi +# +if [ "${SSH_AGENT_PID}" ]; then + ssh-agent -k +fi diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/agent-startup.sh b/arch/3.5.13/trinity-base/trinity-kdebase/agent-startup.sh new file mode 100644 index 000000000..88d1373a1 --- /dev/null +++ b/arch/3.5.13/trinity-base/trinity-kdebase/agent-startup.sh @@ -0,0 +1,19 @@ +# Agents startup file +# +# This file is sourced at kde startup, so that +# the environment variables set here are available +# throughout the session. + +# Uncomment the following lines to start gpg-agent +# and/or ssh-agent at kde startup. +# If you do so, do not forget to uncomment the respective +# lines in KDEDIR/shutdown/agent-shutdown.sh to +# properly kill the agents when the session ends. + +if [ -x /usr/bin/gpg-agent ]; then + eval "$(/usr/bin/gpg-agent --daemon)" +fi +# +if [ -x /usr/bin/ssh-agent ]; then + eval "$(/usr/bin/ssh-agent -s)" +fi diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/arch-kdeshutdown.png b/arch/3.5.13/trinity-base/trinity-kdebase/arch-kdeshutdown.png Binary files differnew file mode 100644 index 000000000..30bc5ab77 --- /dev/null +++ b/arch/3.5.13/trinity-base/trinity-kdebase/arch-kdeshutdown.png diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/dbusfix.diff b/arch/3.5.13/trinity-base/trinity-kdebase/dbusfix.diff deleted file mode 100644 index 8e37b4148..000000000 --- a/arch/3.5.13/trinity-base/trinity-kdebase/dbusfix.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- halbackend.h 2010-08-12 18:37:24.000000000 -0400 -+++ halbackend.h~ 2011-11-03 22:15:02.002228291 -0400 -@@ -40,7 +40,7 @@ - /* We acknowledge the the dbus API is unstable */ - #define DBUS_API_SUBJECT_TO_CHANGE - /* DBus-Qt bindings */ --#include <dbus/connection.h> -+#include "/opt/trinity/include/dbus-1.0/dbus/connection.h" - /* HAL libraries */ - #include <libhal.h> - #include <libhal-storage.h> diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/dbusfix.patch b/arch/3.5.13/trinity-base/trinity-kdebase/dbusfix.patch deleted file mode 100644 index 8e37b4148..000000000 --- a/arch/3.5.13/trinity-base/trinity-kdebase/dbusfix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- halbackend.h 2010-08-12 18:37:24.000000000 -0400 -+++ halbackend.h~ 2011-11-03 22:15:02.002228291 -0400 -@@ -40,7 +40,7 @@ - /* We acknowledge the the dbus API is unstable */ - #define DBUS_API_SUBJECT_TO_CHANGE - /* DBus-Qt bindings */ --#include <dbus/connection.h> -+#include "/opt/trinity/include/dbus-1.0/dbus/connection.h" - /* HAL libraries */ - #include <libhal.h> - #include <libhal-storage.h> diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/docpath.patch b/arch/3.5.13/trinity-base/trinity-kdebase/docpath.patch deleted file mode 100644 index 2fd45a7ab..000000000 --- a/arch/3.5.13/trinity-base/trinity-kdebase/docpath.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -u -r src/kdebase/admin/debianrules kdebase/admin/debianrules ---- src/kdebase/admin/debianrules 2012-01-05 17:41:56.000000000 +0100 -+++ kdebase/admin/debianrules 2011-08-21 09:08:23.000000000 +0200 -@@ -16,7 +16,7 @@ - - $kde_cgidir = "$kde_prefix/lib/cgi-bin"; - $kde_confdir = "$sysconfdir/trinity"; --$kde_htmldir = "$kde_prefix/share/doc/kde/HTML"; -+$kde_htmldir = "$kde_prefix/share/doc/HTML"; - - if (defined $ENV{DEB_BUILD_OPTIONS} && - $ENV{DEB_BUILD_OPTIONS} =~ /\bnostrip\b/) { -diff -u -r src/kdebase/cmake/modules/TDESetupPaths.cmake kdebase/cmake/modules/TDESetupPaths.cmake ---- src/kdebase/cmake/modules/TDESetupPaths.cmake 2012-01-05 17:42:06.000000000 +0100 -+++ kdebase/cmake/modules/TDESetupPaths.cmake 2011-08-21 09:08:24.000000000 +0200 -@@ -41,7 +41,7 @@ - _tde_internal_setup_path( PLUGIN_INSTALL_DIR "${LIB_INSTALL_DIR}/trinity" "The subdirectory relative to the install prefix where plugins will be installed (default is ${LIB_INSTALL_DIR}/trinity)" ) - _tde_internal_setup_path( CONFIG_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/config" "The config file install dir" ) - _tde_internal_setup_path( DATA_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/apps" "The parent directory where applications can install their data" ) -- _tde_internal_setup_path( HTML_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/doc/kde/HTML" "The HTML install dir for documentation" ) -+ _tde_internal_setup_path( HTML_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/doc/HTML" "The HTML install dir for documentation" ) - _tde_internal_setup_path( ICON_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/icons" "The icon install dir (default ${SHARE_INSTALL_PREFIX}/share/icons/)" ) - _tde_internal_setup_path( KCFG_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/config.kcfg" "The install dir for kconfig files" ) - _tde_internal_setup_path( LOCALE_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/locale" "The install dir for translations" ) diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/kdm-default-face.png b/arch/3.5.13/trinity-base/trinity-kdebase/kdm-default-face.png Binary files differnew file mode 100644 index 000000000..233e69475 --- /dev/null +++ b/arch/3.5.13/trinity-base/trinity-kdebase/kdm-default-face.png diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/patches.tar.bz2 b/arch/3.5.13/trinity-base/trinity-kdebase/patches.tar.bz2 Binary files differnew file mode 100644 index 000000000..2e74ade35 --- /dev/null +++ b/arch/3.5.13/trinity-base/trinity-kdebase/patches.tar.bz2 diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/trinity-kdebase.install b/arch/3.5.13/trinity-base/trinity-kdebase/trinity-kdebase.install new file mode 100644 index 000000000..fa5fdeea2 --- /dev/null +++ b/arch/3.5.13/trinity-base/trinity-kdebase/trinity-kdebase.install @@ -0,0 +1,19 @@ +post_install() { + ldconfig &> /dev/null + mkpamserv trinity + echo "Please remember that you can change your kdesu backend" + echo "from su to sudo by adding following lines to your" + echo "~/.trinity/share/kdesurc or to $TDEDIR/share/config/kdesurc:" + echo "[super-user-command]" + echo "super-user-command=sudo" +} + +post_upgrade() { + post_install +} + +post_remove() { + ldconfig &> /dev/null + rm /etc/pam.d/trinity +} + diff --git a/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD b/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD index 605e4ac7e..aa3ba2e80 100644 --- a/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD @@ -11,15 +11,9 @@ groups=('trinity-base') pkgdesc="Trinity DE core libraries" depends=('trinity-arts' 'libxslt' 'libidn' 'libart-lgpl' 'jasper' - 'libxcomposite' 'libcups' + 'libxcomposite' 'libcups' 'libutempter' 'openexr' 'aspell' 'hspell') - # taglib - # libical - # pam-krb5 - # libltdl - # avahi - # libtiff - # openssl + # taglib openssl libtiff avahi libltdl pam-krb5 libical # libutempter - needs to be installed from aur makedepends=('pkgconfig' 'cmake') provides=('kdelibs3') @@ -32,18 +26,17 @@ md5sums=('f62eefb63b4ba2141b4c576f859806dd' install='trinity-kdelibs.install' -_prefix="/opt/trinity" - build() { msg "Setting PATH, CMAKE and Trinity Environment variables" - . /etc/profile.d/qt3.sh - . /etc/profile.d/trinity.sh + # Source the QT and TDE profile + [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh + [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh # compiles without exporting this, since we have profiles - #export CMAKE_PREFIX_PATH=${QTDIR}:${_prefix} - #export PATH=$PATH:${_prefix}/bin - #export CMAKE_INCLUDE_PATH=/usr/include/dbus-1.0:${_prefix}/bin - #export LD_LIBRARY_PATH=${_prefix}/lib:${QTDIR}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH + #export CMAKE_PREFIX_PATH=${QTDIR}:${TDEDIR} + #export PATH=$PATH:${TDEDIR}/bin + #export CMAKE_INCLUDE_PATH=/usr/include/dbus-1.0:${TDEDIR}/bin + #export LD_LIBRARY_PATH=${TDEDIR}/lib:${QTDIR}/lib:${TDEDIR}/lib/trinity:$LD_LIBRARY_PATH msg "Patching..." patch -N -d ${srcdir} -p0 < ${srcdir}/docpath.patch @@ -55,7 +48,7 @@ build() { msg "Starting cmake..." cmake ${srcdir}/kdelibs \ - -DCMAKE_INSTALL_PREFIX=${_prefix} \ + -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ -DCMAKE_VERBOSE_MAKEFILE=OFF \ -DWITH_ARTS=ON \ -DWITH_ALSA=ON \ @@ -67,7 +60,7 @@ build() { -DWITH_TIFF=ON \ -DWITH_JASPER=ON \ -DWITH_OPENEXR=ON \ - -DWITH_UTEMPTER=OFF \ + -DWITH_UTEMPTER=ON \ -DWITH_AVAHI=ON \ -DWITH_ASPELL=ON \ -DWITH_HSPELL=ON @@ -81,12 +74,4 @@ package() { cd ${srcdir}/build make DESTDIR="$pkgdir" install - - # we do this in arts package - #install -d -m755 ${pkgdir}/etc/ld.so.conf.d/ - #echo "${_prefix}/lib" > ${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf - - #install -d -m755 ${pkgdir}/etc/profile.d/ - #install -m644 ${srcdir}/trinity.sh ${pkgdir}/etc/profile.d/ - } diff --git a/arch/3.5.13/trinity-base/trinity-kdelibs/trinity.sh b/arch/3.5.13/trinity-base/trinity-kdelibs/trinity.sh deleted file mode 100644 index cd28e88c4..000000000 --- a/arch/3.5.13/trinity-base/trinity-kdelibs/trinity.sh +++ /dev/null @@ -1,14 +0,0 @@ -export KDEDIR=/opt/trinity -export KDEDIRS=$KDEDIR:/usr -export PATH=$KDEDIR/bin:$PATH -export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$KDEDIR/lib/pkgconfig -if [ ! -z $XDG_DATA_DIRS ]; then - export XDG_DATA_DIRS=$XDG_DATA_DIRS:$KDEDIR/share -else - export XDG_DATA_DIRS=$KDEDIR/share -fi -if [ ! -z $XDG_CONFIG_DIRS ]; then - export XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:$KDEDIR/etc/xdg -else - export XDG_CONFIG_DIRS=$KDEDIR/etc/xdg -fi diff --git a/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD b/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD index 5982a082d..035734818 100644 --- a/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD @@ -137,7 +137,7 @@ build() { [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt3/tools/designer/uilib/Makefile msg "Building - $pkgname..." - + # build sql plugins cd "${srcdir}"/qt3 make -C qmake @@ -147,12 +147,12 @@ build() { "${srcdir}"/qt3/bin/qmake -o Makefile "INCPATH+=/usr/src/include /usr/include/postgresql/server" "LIBS+=-L/usr/lib -lpq" psql.pro cd "${srcdir}"/qt3 - + # fix the broken makefiles # sed -i 's|[[:space:]]*strip.*doc/html.*$|#|g' src/Makefile - + # build rest - make + make } diff --git a/arch/3.5.13/trinity-base/trinity-qt3/qt-odbc.patch b/arch/3.5.13/trinity-base/trinity-qt3/qt-odbc.patch deleted file mode 100644 index 2fefa8155..000000000 --- a/arch/3.5.13/trinity-base/trinity-qt3/qt-odbc.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff -u -r qt3/src/sql/drivers/odbc/qsql_odbc.cpp src/qt3/src/sql/drivers/odbc/qsql_odbc.cpp ---- qt3/src/sql/drivers/odbc/qsql_odbc.cpp 2011-10-30 19:55:58.000000000 +0100 -+++ src/qt3/src/sql/drivers/odbc/qsql_odbc.cpp 2012-01-13 01:24:59.000000000 +0100 -@@ -61,19 +61,18 @@ - #endif - - // newer platform SDKs use SQLLEN instead of SQLINTEGER --#ifdef SQLLEN -+#if defined(SQLLEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX) - # define QSQLLEN SQLLEN - #else - # define QSQLLEN SQLINTEGER - #endif - --#ifdef SQLULEN -+#if defined(SQLULEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX) - # define QSQLULEN SQLULEN - #else - # define QSQLULEN SQLUINTEGER - #endif - -- - static const QSQLLEN COLNAMESIZE = 256; - //Map Qt parameter types to ODBC types - static const SQLSMALLINT qParamType[ 4 ] = { SQL_PARAM_INPUT, SQL_PARAM_INPUT, SQL_PARAM_OUTPUT, SQL_PARAM_INPUT_OUTPUT }; - -diff -u -r qt3/plugins/src/sqldrivers/odbc/odbc.pro src/qt3/plugins/src/sqldrivers/odbc/odbc.pro ---- qt3/plugins/src/sqldrivers/odbc/odbc.pro 2011-10-30 19:55:57.000000000 +0100 -+++ src/qt3/plugins/src/sqldrivers/odbc/odbc.pro 2012-01-13 01:39:11.000000000 +0100 -@@ -10,14 +10,14 @@ - - mac { - !contains( LIBS, .*odbc.* ) { -- LIBS *= -liodbc -+ LIBS *= -lodbc - } - } - - unix { - OBJECTS_DIR = .obj - !contains( LIBS, .*odbc.* ) { -- LIBS *= -liodbc -+ LIBS *= -lodbc - } - } - -diff -u -r qt3/src/sql/qt_sql.pri src/qt3/src/sql/qt_sql.pri ---- qt3/src/sql/qt_sql.pri 2011-10-30 19:55:58.000000000 +0100 -+++ src/qt3/src/sql/qt_sql.pri 2012-01-13 01:39:31.000000000 +0100 -@@ -110,13 +110,13 @@ - - mac { - !contains( LIBS, .*odbc.* ) { -- LIBS *= -liodbc -+ LIBS *= -lodbc - } - } - - unix { - !contains( LIBS, .*odbc.* ) { -- LIBS *= -liodbc -+ LIBS *= -lodbc - } - } diff --git a/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD b/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD index e206f6636..da4086888 100644 --- a/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD @@ -17,12 +17,15 @@ source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/dependencies/tqtinterf 'tqtpc-location.patch') md5sums=('d54cc9fd0b35555298efd17c32471a2b' 'c15745c944d98cb7c4cb553f0ca421d4') +install='trinity-tqtinterface.install' -_prefix=/opt/qt3 +# istead of using prefix, we will use QTDIR from qt3 profile +#_prefix=/opt/qt3 build() { msg "Setting PATH, CMAKE and Trinity Environment variables" - . /etc/profile.d/qt3.sh + # Source the QT and KDE profile + [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh cd $srcdir msg "Creating out-of-source build directory: ${srcdir}/build" @@ -31,15 +34,15 @@ build() { msg "Starting cmake..." cmake "../dependencies/tqtinterface" \ - -DCMAKE_INSTALL_PREFIX=${_prefix} \ + -DCMAKE_INSTALL_PREFIX=${QTDIR} \ -DQT_PREFIX_DIR=${QTDIR} \ -DQT_INCLUDE_DIR=${QTDIR}/include \ - -DQT_VERSION=3 \ - -DMOC_EXECUTABLE=${QTDIR}/bin/moc -# -DQT_INCLUDE_DIR=${_prefix}/include/tqt/Qt -# -DQT_LIBRARY_DIRS=/opt/qt/lib \ + -DMOC_EXECUTABLE=${QTDIR}/bin/moc \ + -DQT_VERSION=3 +# -DQT_INCLUDE_DIR=${QTDIR}/include/tqt/Qt # -DQT_LIBRARY_DIRS=/opt/qt/lib \ # -DCMAKE_SKIP_RPATH=ON || return 1 + make } @@ -49,8 +52,8 @@ package() { make DESTDIR="${pkgdir}" install # include uic-tqt in package -# cd ${srcdir} -# mkdir -p ${pkgdir}/usr/bin -# cp -Rp ${srcdir}/${_svnmod}/qtinterface/uic-tqt ${pkgdir}/usr/bin + #cd ${srcdir} + #mkdir -p ${pkgdir}/usr/bin + #cp -Rp ${srcdir}/${_svnmod}/qtinterface/uic-tqt ${pkgdir}/usr/bin } diff --git a/arch/3.5.13/trinity-base/trinity-tqtinterface/trinity-tqtinterface.install b/arch/3.5.13/trinity-base/trinity-tqtinterface/trinity-tqtinterface.install new file mode 100644 index 000000000..2a8dc4c98 --- /dev/null +++ b/arch/3.5.13/trinity-base/trinity-tqtinterface/trinity-tqtinterface.install @@ -0,0 +1,12 @@ +post_install() { + ldconfig &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + |
