From 13b71d3646054a698956460aa4246d9c9167dee4 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Tue, 19 Feb 2008 16:31:45 +0000 Subject: Output NUL terminated lines with sort -z (busybox#1591). Fixes updatedb. --- packages/busybox/busybox-1.9.1/sort-z-nul.patch | 50 +++++++++++++++++++++++++ packages/busybox/busybox_1.9.1.bb | 3 +- 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 packages/busybox/busybox-1.9.1/sort-z-nul.patch diff --git a/packages/busybox/busybox-1.9.1/sort-z-nul.patch b/packages/busybox/busybox-1.9.1/sort-z-nul.patch new file mode 100644 index 0000000000..55452a4524 --- /dev/null +++ b/packages/busybox/busybox-1.9.1/sort-z-nul.patch @@ -0,0 +1,50 @@ +Summary: 0001591: inconsistent behavior of sort -z + +URL: http://busybox.net/bugs/view.php?id=1591 +http://www.busybox.net/cgi-bin/viewcvs.cgi/trunk/busybox/coreutils/sort.c?rev=21004&r1=20435&r2=21004&makepatch=1&diff_format=u + +Description: + +busybox sort -z does: +use NUL instead of EOL on input + +GNU sort -z does: +use NUL instead of EOL on input and output + +GNU sort -z documents: +use NUL instead of EOL on input + +Additional Information: + +Note that sort -z is not part of any standard. But several applications +(e. g. GNU findutils updatedb) depends on the NUL-on-output behavior. + +GNU sort documentation bug was reported to coreutils maintainers. + +Notes: + +vda 02-13-08 06:30 (0004364) +Fixed in revision 21004. Thanks! + +--- busybox/coreutils/sort.c 2007/11/16 12:39:16 20435 ++++ busybox/coreutils/sort.c 2008/02/13 14:30:33 21004 +@@ -32,7 +32,7 @@ + FLAG_u = 8, /* Unique */ + FLAG_c = 0x10, /* Check: no output, exit(!ordered) */ + FLAG_s = 0x20, /* Stable sort, no ascii fallback at end */ +- FLAG_z = 0x40, /* Input is null terminated, not \n */ ++ FLAG_z = 0x40, /* Input and output is NUL terminated, not \n */ + /* These can be applied to search keys, the previous four can't */ + FLAG_b = 0x80, /* Ignore leading blanks */ + FLAG_r = 0x100, /* Reverse */ +@@ -396,8 +396,9 @@ + if (linecount) linecount = flag+1; + } + /* Print it */ ++ flag = (option_mask32 & FLAG_z) ? '\0' : '\n'; + for (i = 0; i < linecount; i++) +- fprintf(outfile, "%s\n", lines[i]); ++ fprintf(outfile, "%s%c", lines[i], flag); + + fflush_stdout_and_exit(EXIT_SUCCESS); + } diff --git a/packages/busybox/busybox_1.9.1.bb b/packages/busybox/busybox_1.9.1.bb index b41f1779b0..237f6a6dac 100644 --- a/packages/busybox/busybox_1.9.1.bb +++ b/packages/busybox/busybox_1.9.1.bb @@ -1,5 +1,5 @@ require busybox.inc -PR = "r1" +PR = "r2" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://busybox-cron \ @@ -12,6 +12,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://syslog.conf \ file://udhcpscript.patch;patch=1 \ file://adduser-longops.patch;patch=1 \ + file://sort-z-nul.patch;patch=1;status=upstream \ file://umount.busybox \ file://run_parts.c \ file://defconfig" -- cgit v1.2.3 From 74a532e4bc5f8b037d050a0a1fb66ea35eeac1ec Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Tue, 19 Feb 2008 17:08:48 +0000 Subject: - Ignore false toggle signals (work-around for OE#3390). - Fixed default ALSA state for SL-Cxx00 (OE#2617). - Do not alter incorrect mixer levels by zaurus-mixer-callback. - Allow to disable rotation by touch ~/.norot. - Fixed detection of panel_user. --- packages/zaurusd/files/01-check-toggle-landscape | 9 + packages/zaurusd/files/01-check-toggle-portait | 9 + .../zaurusd/files/alsa-cxx00-default.state.patch | 276 +++++++++++++++------ packages/zaurusd/files/zaurus-hinge.in | 7 +- .../zaurusd/files/zaurusd-mixer-callback.patch | 11 - packages/zaurusd/zaurusd_svn.bb | 10 +- 6 files changed, 237 insertions(+), 85 deletions(-) create mode 100644 packages/zaurusd/files/01-check-toggle-landscape create mode 100644 packages/zaurusd/files/01-check-toggle-portait delete mode 100644 packages/zaurusd/files/zaurusd-mixer-callback.patch diff --git a/packages/zaurusd/files/01-check-toggle-landscape b/packages/zaurusd/files/01-check-toggle-landscape new file mode 100644 index 0000000000..13ae9a4e68 --- /dev/null +++ b/packages/zaurusd/files/01-check-toggle-landscape @@ -0,0 +1,9 @@ +#!/bin/sh + +# Try to determine and ignore false rotation signals caused by +# headphones removal or remote removal remembering the old state. +# OE#3390 +if test "`cat /var/run/last-screen-rotation`" = landscape ; then + exit +fi +echo landscape > /var/run/last-screen-rotation diff --git a/packages/zaurusd/files/01-check-toggle-portait b/packages/zaurusd/files/01-check-toggle-portait new file mode 100644 index 0000000000..4c3b7f1291 --- /dev/null +++ b/packages/zaurusd/files/01-check-toggle-portait @@ -0,0 +1,9 @@ +#!/bin/sh + +# Try to determine and ignore false rotation signals caused by +# headphones removal or remote removal remembering the old state. +# OE#3390 +if test "`cat /var/run/last-screen-rotation`" = portait ; then + exit +fi +echo portait > /var/run/last-screen-rotation diff --git a/packages/zaurusd/files/alsa-cxx00-default.state.patch b/packages/zaurusd/files/alsa-cxx00-default.state.patch index c3e234b534..b10e6c85dd 100644 --- a/packages/zaurusd/files/alsa-cxx00-default.state.patch +++ b/packages/zaurusd/files/alsa-cxx00-default.state.patch @@ -1,64 +1,194 @@ ---- zaurusd/config/alsa/cxx00-default.state.orig 2006-06-28 08:45:07.000000000 +0000 -+++ zaurusd/config/alsa/cxx00-default.state 2007-05-21 21:40:50.000000000 +0000 -@@ -32,7 +32,7 @@ +http://bugs.openembedded.org/show_bug.cgi?id=2617 +- Fixes default ALSA state for SL-Cxx00. + * Treble level reflects kernel fix alsa-wm8750-treble.patch (>2.6.24). + * Increased Mic Levels and Boost. + * Enabled Capture Switch. + * Improved Headphones / Speaker volume balance. + * 3D Mode changed to "Playback" (still Off by default). + * Disabled all bypasses. + * All Mono signals decreased to 0 (not connected). + * Line Mux changed to differential, keeping PGA unused. + * Using Digital mono for recording (jack supports ony mono). + * Enabled Automatic Level Control, optimized for voice recording. + * Enabled Zero Cross volume changes. +- Do not alter incorrect mixer levels by zaurus-mixer-callback. + +Index: zaurusd/config/alsa/cxx00-default.state +=================================================================== +--- zaurusd.orig/config/alsa/cxx00-default.state 2006-06-28 08:45:07.000000000 +0000 ++++ zaurusd/config/alsa/cxx00-default.state 2007-11-27 23:06:43.000000000 +0000 +@@ -6,8 +6,8 @@ + comment.range '0 - 63' + iface MIXER + name 'Capture Volume' +- value.0 23 +- value.1 23 ++ value.0 48 ++ value.1 48 + } + control.2 { + comment.access 'read write' +@@ -15,8 +15,8 @@ + comment.count 2 + iface MIXER + name 'Capture ZC Switch' +- value.0 false +- value.1 false ++ value.0 true ++ value.1 true + } + control.3 { + comment.access 'read write' +@@ -24,26 +24,26 @@ + comment.count 2 + iface MIXER + name 'Capture Switch' +- value.0 false +- value.1 false ++ value.0 true ++ value.1 true + } + control.4 { + comment.access 'read write' comment.type BOOLEAN comment.count 2 iface MIXER - name 'Out1 Playback ZC Switch' +- value.0 false +- value.1 false + name 'Headphone Playback ZC Switch' - value.0 false - value.1 false ++ value.0 true ++ value.1 true } -@@ -41,7 +41,7 @@ + control.5 { + comment.access 'read write' comment.type BOOLEAN comment.count 2 iface MIXER - name 'Out2 Playback ZC Switch' +- value.0 false +- value.1 false + name 'Speaker Playback ZC Switch' - value.0 false - value.1 false ++ value.0 true ++ value.1 true + } + control.6 { + comment.access 'read write' +@@ -92,8 +92,8 @@ + comment.range '0 - 255' + iface MIXER + name 'PCM Volume' +- value.0 255 +- value.1 255 ++ value.0 220 ++ value.1 220 } -@@ -218,7 +218,7 @@ - comment.item.3 Stereo + control.11 { + comment.access 'read write' +@@ -131,7 +131,7 @@ + comment.range '0 - 15' + iface MIXER + name 'Treble Volume' +- value 15 ++ value 0 + } + control.15 { + comment.access 'read write' +@@ -188,7 +188,7 @@ + comment.item.1 Playback iface MIXER - name 'ALC Capture Function' -- value Left -+ value Off + name '3D Mode' +- value Capture ++ value Playback } - control.24 { + control.21 { comment.access 'read write' -@@ -321,8 +321,8 @@ +@@ -226,7 +226,7 @@ + comment.count 1 + iface MIXER + name 'ALC Capture ZC Switch' +- value false ++ value true + } + control.25 { + comment.access 'read write' +@@ -235,7 +235,7 @@ + comment.range '0 - 15' + iface MIXER + name 'ALC Capture Hold Time' +- value 0 ++ value 9 + } + control.26 { + comment.access 'read write' +@@ -244,7 +244,7 @@ + comment.range '0 - 15' + iface MIXER + name 'ALC Capture Decay Time' +- value 3 ++ value 9 + } + control.27 { + comment.access 'read write' +@@ -253,7 +253,7 @@ + comment.range '0 - 15' + iface MIXER + name 'ALC Capture Attack Time' +- value 2 ++ value 3 + } + control.28 { + comment.access 'read write' +@@ -306,7 +306,7 @@ + comment.count 1 + iface MIXER + name 'ZC Timeout Switch' +- value false ++ value true + } + control.34 { + comment.access 'read write' +@@ -321,7 +321,7 @@ comment.type BOOLEAN comment.count 1 iface MIXER - name 'Right Out2 Playback Invert Switch' -- value true + name 'Right Speaker Playback Invert Switch' -+ value false + value true } control.36 { - comment.access 'read write' @@ -331,8 +331,8 @@ comment.range '0 - 3' iface MIXER name 'Mic Boost' - value.0 2 - value.1 2 ++ value.0 3 ++ value.1 3 + } + control.37 { + comment.access 'read write' +@@ -341,8 +341,8 @@ + comment.range '0 - 7' + iface MIXER + name 'Bypass Left Playback Volume' +- value.0 2 +- value.1 2 + value.0 0 + value.1 0 } - control.37 { + control.38 { comment.access 'read write' -@@ -351,8 +351,8 @@ +@@ -361,8 +361,8 @@ comment.range '0 - 7' iface MIXER - name 'Bypass Right Playback Volume' -- value.0 0 -- value.1 0 -+ value.0 2 -+ value.1 2 + name 'Bypass Mono Playback Volume' +- value.0 2 +- value.1 2 ++ value.0 0 ++ value.1 0 } - control.39 { + control.40 { comment.access 'read write' @@ -378,9 +378,9 @@ comment.count 2 @@ -68,8 +198,8 @@ - value.0 120 - value.1 120 + name 'Headphone Playback Volume' -+ value.0 121 -+ value.1 121 ++ value.0 105 ++ value.1 105 } control.42 { comment.access 'read write' @@ -81,17 +211,26 @@ - value.0 119 - value.1 119 + name 'Speaker Playback Volume' -+ value.0 121 -+ value.1 121 ++ value.0 127 ++ value.1 127 } control.43 { comment.access 'read write' +@@ -399,7 +399,7 @@ + comment.range '0 - 127' + iface MIXER + name 'Mono Playback Volume' +- value 121 ++ value 0 + } + control.44 { + comment.access 'read write' @@ -411,7 +411,7 @@ comment.item.3 'Digital Mono' iface MIXER name 'Right ADC Mux' - value 'Mono (Left)' -+ value Stereo ++ value 'Digital Mono' } control.45 { comment.access 'read write' @@ -100,55 +239,19 @@ iface MIXER name 'Left ADC Mux' - value 'Mono (Left)' -+ value Stereo ++ value 'Digital Mono' } control.46 { comment.access 'read write' -@@ -458,7 +458,7 @@ - comment.item.4 Differential - iface MIXER - name 'Right Line Mux' -- value Differential -+ value 'Line 1' - } - control.49 { - comment.access 'read write' @@ -471,7 +471,7 @@ comment.item.4 Differential iface MIXER name 'Left Line Mux' - value PGA -+ value 'Line 1' ++ value Differential } control.50 { comment.access 'read write' -@@ -483,7 +483,7 @@ - comment.item.3 Differential - iface MIXER - name 'Right PGA Mux' -- value Differential -+ value 'Line 1' - } - control.51 { - comment.access 'read write' -@@ -495,7 +495,7 @@ - comment.item.3 Differential - iface MIXER - name 'Left PGA Mux' -- value Differential -+ value 'Line 1' - } - control.52 { - comment.access 'read write' -@@ -535,7 +535,7 @@ - comment.count 1 - iface MIXER - name 'Right Mixer Left Playback Switc' -- value false -+ value true - } - control.57 { - comment.access 'read write' @@ -610,9 +610,8 @@ comment.access 'read write' comment.type ENUMERATED @@ -161,3 +264,38 @@ iface MIXER name 'Speaker Function' value On +Index: zaurusd/scripts/zaurus-mixer-callback.in +=================================================================== +--- zaurusd.orig/scripts/zaurus-mixer-callback.in 2007-11-27 23:32:45.000000000 +0000 ++++ zaurusd/scripts/zaurus-mixer-callback.in 2007-11-27 23:36:54.000000000 +0000 +@@ -16,8 +16,6 @@ + JACK="$1" + SPK="$2" + LEFT="true" +-RLPLAYBACK="false" +-RLBYPASS="false" + + case $SPK in + "On") +@@ -37,8 +35,6 @@ + ;; + "Headset" | "Mic" | "Line") + LEFT="false" +- RLPLAYBACK="true" +- RLBYPASS="true" + SPK="Off" + ;; + *) +@@ -58,12 +54,6 @@ + }; /Speaker Function/ { + N + s:\(Speaker Function.*\n.*value \).*$:\1$SPK: +-}; /Right Mixer Left Playback/ { +-N +-s:\(Right Mixer Left Playback.*\n.*value \).*$:\1$RLPLAYBACK: +-}; /Right Mixer Left Bypass/ { +-N +-s:\(Right Mixer Left Bypass.*\n.*value \).*$:\1$RLBYPASS: + }; /Left Mixer Playback/ { + N + s:\(Left Mixer Playback.*\n.*value \).*$:\1$LEFT: diff --git a/packages/zaurusd/files/zaurus-hinge.in b/packages/zaurusd/files/zaurus-hinge.in index f719ba3c76..9670e8803e 100644 --- a/packages/zaurusd/files/zaurus-hinge.in +++ b/packages/zaurusd/files/zaurus-hinge.in @@ -19,9 +19,12 @@ if [ -z "$1" ]; then exit 1 fi -panel_user="`ps aux|grep matchbox-panel|grep -v grep | awk '{print $2}'`" - +panel_user="`ps aux|grep matchbox-panel|grep -v grep | awk '{print $1}'`" +# touch ~/.norot can disable rotation. +if test -f /home/$panel_user/.norot ; then + exit +fi STATE=$1 diff --git a/packages/zaurusd/files/zaurusd-mixer-callback.patch b/packages/zaurusd/files/zaurusd-mixer-callback.patch deleted file mode 100644 index 7c9455d042..0000000000 --- a/packages/zaurusd/files/zaurusd-mixer-callback.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- zaurusd/scripts/zaurus-mixer-callback.in.orig 2007-06-05 03:15:30.000000000 +0000 -+++ zaurusd/scripts/zaurus-mixer-callback.in 2007-06-05 03:14:53.000000000 +0000 -@@ -16,7 +16,7 @@ - JACK="$1" - SPK="$2" - LEFT="true" --RLPLAYBACK="false" -+RLPLAYBACK="true" - RLBYPASS="false" - - case $SPK in diff --git a/packages/zaurusd/zaurusd_svn.bb b/packages/zaurusd/zaurusd_svn.bb index 3ea0d2b22f..be9379eced 100644 --- a/packages/zaurusd/zaurusd_svn.bb +++ b/packages/zaurusd/zaurusd_svn.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" DEPENDS = "tslib" RDEPENDS = "procps" PV = "0.0+svn${SRCDATE}" -PR = "r16" +PR = "r17" SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \ file://zaurus-hinge.in \ @@ -14,10 +14,11 @@ SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \ file://disable-alsa-handling.patch;patch=1 \ file://zaurus-hinge.matchbox-portrait \ file://zaurus-hinge.matchbox-landscape \ - file://zaurusd-mixer-callback.patch;patch=1 \ file://tslib-1.diff;patch=1 \ file://zaurus-hinge.bl-on \ - file://zaurus-hinge.bl-off" + file://zaurus-hinge.bl-off \ + file://01-check-toggle-landscape \ + file://01-check-toggle-portait" S = "${WORKDIR}/${PN}" @@ -39,6 +40,9 @@ do_install_append() { install -m 0755 "${WORKDIR}/zaurus-hinge.bl-on" "${D}/etc/zaurusd/hinge-portrait.d/00-backlight-on" install -m 0755 "${WORKDIR}/zaurus-hinge.bl-off" "${D}/etc/zaurusd/hinge-close.d/00-backlight-off" + install -m 0755 "${WORKDIR}/01-check-toggle-landscape" "${D}/etc/zaurusd/hinge-landscape.d/01-check-toggle" + install -m 0755 "${WORKDIR}/01-check-toggle-portait" "${D}/etc/zaurusd/hinge-portrait.d/01-check-toggle" + install -m 0755 "${WORKDIR}/zaurus-hinge.matchbox-landscape" "${D}/etc/zaurusd/hinge-landscape.d/20-matchbox-landscape" install -m 0755 "${WORKDIR}/zaurus-hinge.matchbox-portrait" "${D}/etc/zaurusd/hinge-portrait.d/20-matchbox-portrait" } -- cgit v1.2.3 From 3b7ea13cbd6916d7a0855411573598c52afb4290 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 19 Feb 2008 19:11:42 +0000 Subject: add libjson, a library to create and parse json files --- packages/libjson/.mtn2git_empty | 0 packages/libjson/libjson_0.6.bb | 15 +++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 packages/libjson/.mtn2git_empty create mode 100644 packages/libjson/libjson_0.6.bb diff --git a/packages/libjson/.mtn2git_empty b/packages/libjson/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/libjson/libjson_0.6.bb b/packages/libjson/libjson_0.6.bb new file mode 100644 index 0000000000..4c93e82a0b --- /dev/null +++ b/packages/libjson/libjson_0.6.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "A library for parsing and creating JSON files" +HOMEPAGE = "http://oss.metaparadigm.com/json-c/" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "BSD" +PR = "r0" + +SRC_URI = "http://oss.metaparadigm.com/json-c/json-c-${PV}.tar.gz" +S = "${WORKDIR}/json-c-${PV}" + +inherit autotools + +do_stage() { + autotools_stage_all +} -- cgit v1.2.3 From 0bf5a6a8d22ab206b36b2bc7a54ef30c83a9e8d8 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 19 Feb 2008 19:26:01 +0000 Subject: repair openmoko-python-devel-image --- packages/images/openmoko-python-devel-image.bb | 3 ++- packages/tasks/task-python-efl-examples.bb | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/images/openmoko-python-devel-image.bb b/packages/images/openmoko-python-devel-image.bb index 9d2a8db2c6..615042f3b8 100644 --- a/packages/images/openmoko-python-devel-image.bb +++ b/packages/images/openmoko-python-devel-image.bb @@ -2,5 +2,6 @@ require openmoko-image.bb IMAGE_INSTALL += "\ task-openmoko-python-devel \ + task-python-efl-examples \ + edje-viewer \ " - diff --git a/packages/tasks/task-python-efl-examples.bb b/packages/tasks/task-python-efl-examples.bb index 0a4e32097f..e78a4cabae 100644 --- a/packages/tasks/task-python-efl-examples.bb +++ b/packages/tasks/task-python-efl-examples.bb @@ -2,9 +2,13 @@ DESCRIPTION = "Python Examples for the Enlightenment Foundation Libraries" LICENSE = "MIT" SECTION = "devel/python" RDEPENDS = "\ - python-efl python-ecore-examples python-emotion-examples python-edje-examples python-epsilon-examples \ + task-python-efl \ + python-ecore-examples \ + python-emotion-examples \ + python-edje-examples \ + python-epsilon-examples \ python-math python-textutils \ " -PR = "ml2" +PR = "ml3" ALLOW_EMPTY = "1" -- cgit v1.2.3 From 5afdb5f594d828b1f948ea5dc7820e3d1deef4e6 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 19 Feb 2008 19:40:27 +0000 Subject: add blackbox 0.70.1, fixes #981 --- packages/blackbox/.mtn2git_empty | 0 packages/blackbox/blackbox_0.70.1.bb | 14 ++++++++++++++ packages/blackbox/files/.mtn2git_empty | 0 packages/blackbox/files/remove-host-includes.patch | 19 +++++++++++++++++++ 4 files changed, 33 insertions(+) create mode 100644 packages/blackbox/.mtn2git_empty create mode 100644 packages/blackbox/blackbox_0.70.1.bb create mode 100644 packages/blackbox/files/.mtn2git_empty create mode 100644 packages/blackbox/files/remove-host-includes.patch diff --git a/packages/blackbox/.mtn2git_empty b/packages/blackbox/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/blackbox/blackbox_0.70.1.bb b/packages/blackbox/blackbox_0.70.1.bb new file mode 100644 index 0000000000..50dc5a69c6 --- /dev/null +++ b/packages/blackbox/blackbox_0.70.1.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Blackbox Window Manager" +SECTION = "x11/wm" +LICENSE = "GPL" +DEPENDS = "libx11 libxext libxcomposite libxfixes libxdamage libxrender libxinerama libxpm xrandr xft" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/blackboxwm/blackbox-0.70.1.tar.gz \ + file://remove-host-includes.patch;patch=1" +S = "${WORKDIR}/blackbox-${PV}" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-i18n --without-imlib --with-xpm --with-gnome-menus" + diff --git a/packages/blackbox/files/.mtn2git_empty b/packages/blackbox/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/blackbox/files/remove-host-includes.patch b/packages/blackbox/files/remove-host-includes.patch new file mode 100644 index 0000000000..bf557b51da --- /dev/null +++ b/packages/blackbox/files/remove-host-includes.patch @@ -0,0 +1,19 @@ +Index: blackbox-0.70.1/configure.ac +=================================================================== +--- blackbox-0.70.1.orig/configure.ac ++++ blackbox-0.70.1/configure.ac +@@ -8,14 +8,6 @@ AC_CONFIG_SRCDIR([src/blackbox.cc]) + dnl Determine default prefix + test "x$prefix" = "xNONE" && prefix="$ac_default_prefix" + +-dnl Look in the most logical places for external libraries +-CPPFLAGS="$CPPFLAGS -I$prefix/include" +-LDFLAGS="$LDFLAGS -L$prefix/lib" +-if test "x$prefix" != "x/usr/local"; then +- CPPFLAGS="$CPPFLAGS -I/usr/local/include" +- LDFLAGS="$LDFLAGS -L/usr/local/lib" +-fi +- + dnl Locate required external software + AC_PROG_CC + -- cgit v1.2.3 From 0efa4c6c1cf75c70c9eae673daae44e937a92e1f Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Tue, 19 Feb 2008 23:35:23 +0000 Subject: Fixed default ALSA state for SL-Cxx00 (OE#2617). * Fixes bass/treble levels (reflects kernel fix alsa-wm8750-treble.patch (>2.6.24)). * Increased Mic Levels and Boost. * Enabled Capture Switch. * Improved Headphones / Speaker volume balance. * Disabled all bypasses. * Disabled Left -> Right routing. * All Mono signals decreased to 0 (not connected). * Line Mux changed to differential, keeping PGA unused. * Using Digital mono for recording (jack supports ony mono). * Enabled Automatic Level Control, optimized for voice recording. * Enabled Zero Cross volume changes. --- packages/alsa/alsa-state/akita/asound.state | 66 +++++++++++------------ packages/alsa/alsa-state/spitz/asound.state | 82 ++++++++++++++--------------- 2 files changed, 74 insertions(+), 74 deletions(-) diff --git a/packages/alsa/alsa-state/akita/asound.state b/packages/alsa/alsa-state/akita/asound.state index ee5ef519c3..d1bacfb708 100644 --- a/packages/alsa/alsa-state/akita/asound.state +++ b/packages/alsa/alsa-state/akita/asound.state @@ -6,8 +6,8 @@ state.Spitz { comment.range '0 - 63' iface MIXER name 'Capture Volume' - value.0 23 - value.1 23 + value.0 48 + value.1 48 } control.2 { comment.access 'read write' @@ -15,8 +15,8 @@ state.Spitz { comment.count 2 iface MIXER name 'Capture ZC Switch' - value.0 false - value.1 false + value.0 true + value.1 true } control.3 { comment.access 'read write' @@ -24,8 +24,8 @@ state.Spitz { comment.count 2 iface MIXER name 'Capture Switch' - value.0 false - value.1 false + value.0 true + value.1 true } control.4 { comment.access 'read write' @@ -33,8 +33,8 @@ state.Spitz { comment.count 2 iface MIXER name 'Headphone Playback ZC Switch' - value.0 false - value.1 false + value.0 true + value.1 true } control.5 { comment.access 'read write' @@ -42,8 +42,8 @@ state.Spitz { comment.count 2 iface MIXER name 'Speaker Playback ZC Switch' - value.0 false - value.1 false + value.0 true + value.1 true } control.6 { comment.access 'read write' @@ -92,8 +92,8 @@ state.Spitz { comment.range '0 - 255' iface MIXER name 'PCM Volume' - value.0 255 - value.1 255 + value.0 220 + value.1 220 } control.11 { comment.access 'read write' @@ -122,7 +122,7 @@ state.Spitz { comment.range '0 - 15' iface MIXER name 'Bass Volume' - value 11 + value 0 } control.14 { comment.access 'read write' @@ -131,7 +131,7 @@ state.Spitz { comment.range '0 - 15' iface MIXER name 'Treble Volume' - value 11 + value 0 } control.15 { comment.access 'read write' @@ -158,7 +158,7 @@ state.Spitz { comment.range '0 - 15' iface MIXER name '3D Volume' - value 9 + value 0 } control.18 { comment.access 'read write' @@ -226,7 +226,7 @@ state.Spitz { comment.count 1 iface MIXER name 'ALC Capture ZC Switch' - value false + value true } control.25 { comment.access 'read write' @@ -235,7 +235,7 @@ state.Spitz { comment.range '0 - 15' iface MIXER name 'ALC Capture Hold Time' - value 0 + value 9 } control.26 { comment.access 'read write' @@ -244,7 +244,7 @@ state.Spitz { comment.range '0 - 15' iface MIXER name 'ALC Capture Decay Time' - value 3 + value 9 } control.27 { comment.access 'read write' @@ -253,7 +253,7 @@ state.Spitz { comment.range '0 - 15' iface MIXER name 'ALC Capture Attack Time' - value 2 + value 3 } control.28 { comment.access 'read write' @@ -298,7 +298,7 @@ state.Spitz { comment.range '0 - 255' iface MIXER name 'Right ADC Capture Volume' - value 0 + value 195 } control.33 { comment.access 'read write' @@ -306,7 +306,7 @@ state.Spitz { comment.count 1 iface MIXER name 'ZC Timeout Switch' - value false + value true } control.34 { comment.access 'read write' @@ -331,8 +331,8 @@ state.Spitz { comment.range '0 - 3' iface MIXER name 'Mic Boost' - value.0 0 - value.1 0 + value.0 3 + value.1 3 } control.37 { comment.access 'read write' @@ -379,8 +379,8 @@ state.Spitz { comment.range '0 - 127' iface MIXER name 'Headphone Playback Volume' - value.0 121 - value.1 121 + value.0 105 + value.1 105 } control.42 { comment.access 'read write' @@ -389,8 +389,8 @@ state.Spitz { comment.range '0 - 127' iface MIXER name 'Speaker Playback Volume' - value.0 121 - value.1 121 + value.0 127 + value.1 127 } control.43 { comment.access 'read write' @@ -411,7 +411,7 @@ state.Spitz { comment.item.3 'Digital Mono' iface MIXER name 'Right ADC Mux' - value 'Mono (Left)' + value 'Digital Mono' } control.45 { comment.access 'read write' @@ -423,7 +423,7 @@ state.Spitz { comment.item.3 'Digital Mono' iface MIXER name 'Left ADC Mux' - value 'Mono (Left)' + value 'Digital Mono' } control.46 { comment.access 'read write' @@ -458,7 +458,7 @@ state.Spitz { comment.item.4 Differential iface MIXER name 'Right Line Mux' - value 'Line 2' + value Differential } control.49 { comment.access 'read write' @@ -471,7 +471,7 @@ state.Spitz { comment.item.4 Differential iface MIXER name 'Left Line Mux' - value 'Line 1' + value Differential } control.50 { comment.access 'read write' @@ -483,7 +483,7 @@ state.Spitz { comment.item.3 Differential iface MIXER name 'Right PGA Mux' - value 'Line 2' + value Differential } control.51 { comment.access 'read write' @@ -495,7 +495,7 @@ state.Spitz { comment.item.3 Differential iface MIXER name 'Left PGA Mux' - value 'Line 1' + value Differential } control.52 { comment.access 'read write' diff --git a/packages/alsa/alsa-state/spitz/asound.state b/packages/alsa/alsa-state/spitz/asound.state index 81b6ed9814..d1bacfb708 100644 --- a/packages/alsa/alsa-state/spitz/asound.state +++ b/packages/alsa/alsa-state/spitz/asound.state @@ -6,8 +6,8 @@ state.Spitz { comment.range '0 - 63' iface MIXER name 'Capture Volume' - value.0 23 - value.1 23 + value.0 48 + value.1 48 } control.2 { comment.access 'read write' @@ -15,8 +15,8 @@ state.Spitz { comment.count 2 iface MIXER name 'Capture ZC Switch' - value.0 false - value.1 false + value.0 true + value.1 true } control.3 { comment.access 'read write' @@ -24,8 +24,8 @@ state.Spitz { comment.count 2 iface MIXER name 'Capture Switch' - value.0 false - value.1 false + value.0 true + value.1 true } control.4 { comment.access 'read write' @@ -33,8 +33,8 @@ state.Spitz { comment.count 2 iface MIXER name 'Headphone Playback ZC Switch' - value.0 false - value.1 false + value.0 true + value.1 true } control.5 { comment.access 'read write' @@ -42,8 +42,8 @@ state.Spitz { comment.count 2 iface MIXER name 'Speaker Playback ZC Switch' - value.0 false - value.1 false + value.0 true + value.1 true } control.6 { comment.access 'read write' @@ -92,8 +92,8 @@ state.Spitz { comment.range '0 - 255' iface MIXER name 'PCM Volume' - value.0 255 - value.1 255 + value.0 220 + value.1 220 } control.11 { comment.access 'read write' @@ -131,7 +131,7 @@ state.Spitz { comment.range '0 - 15' iface MIXER name 'Treble Volume' - value 15 + value 0 } control.15 { comment.access 'read write' @@ -188,7 +188,7 @@ state.Spitz { comment.item.1 Playback iface MIXER name '3D Mode' - value Capture + value Playback } control.21 { comment.access 'read write' @@ -218,7 +218,7 @@ state.Spitz { comment.item.3 Stereo iface MIXER name 'ALC Capture Function' - value Off + value Left } control.24 { comment.access 'read write' @@ -226,7 +226,7 @@ state.Spitz { comment.count 1 iface MIXER name 'ALC Capture ZC Switch' - value false + value true } control.25 { comment.access 'read write' @@ -235,7 +235,7 @@ state.Spitz { comment.range '0 - 15' iface MIXER name 'ALC Capture Hold Time' - value 0 + value 9 } control.26 { comment.access 'read write' @@ -244,7 +244,7 @@ state.Spitz { comment.range '0 - 15' iface MIXER name 'ALC Capture Decay Time' - value 3 + value 9 } control.27 { comment.access 'read write' @@ -253,7 +253,7 @@ state.Spitz { comment.range '0 - 15' iface MIXER name 'ALC Capture Attack Time' - value 2 + value 3 } control.28 { comment.access 'read write' @@ -306,7 +306,7 @@ state.Spitz { comment.count 1 iface MIXER name 'ZC Timeout Switch' - value false + value true } control.34 { comment.access 'read write' @@ -322,7 +322,7 @@ state.Spitz { comment.count 1 iface MIXER name 'Right Speaker Playback Invert Switch' - value false + value true } control.36 { comment.access 'read write' @@ -331,8 +331,8 @@ state.Spitz { comment.range '0 - 3' iface MIXER name 'Mic Boost' - value.0 0 - value.1 0 + value.0 3 + value.1 3 } control.37 { comment.access 'read write' @@ -341,8 +341,8 @@ state.Spitz { comment.range '0 - 7' iface MIXER name 'Bypass Left Playback Volume' - value.0 2 - value.1 2 + value.0 0 + value.1 0 } control.38 { comment.access 'read write' @@ -351,8 +351,8 @@ state.Spitz { comment.range '0 - 7' iface MIXER name 'Bypass Right Playback Volume' - value.0 2 - value.1 2 + value.0 0 + value.1 0 } control.39 { comment.access 'read write' @@ -361,8 +361,8 @@ state.Spitz { comment.range '0 - 7' iface MIXER name 'Bypass Mono Playback Volume' - value.0 2 - value.1 2 + value.0 0 + value.1 0 } control.40 { comment.access 'read write' @@ -379,8 +379,8 @@ state.Spitz { comment.range '0 - 127' iface MIXER name 'Headphone Playback Volume' - value.0 121 - value.1 121 + value.0 105 + value.1 105 } control.42 { comment.access 'read write' @@ -389,8 +389,8 @@ state.Spitz { comment.range '0 - 127' iface MIXER name 'Speaker Playback Volume' - value.0 121 - value.1 121 + value.0 127 + value.1 127 } control.43 { comment.access 'read write' @@ -399,7 +399,7 @@ state.Spitz { comment.range '0 - 127' iface MIXER name 'Mono Playback Volume' - value 121 + value 0 } control.44 { comment.access 'read write' @@ -411,7 +411,7 @@ state.Spitz { comment.item.3 'Digital Mono' iface MIXER name 'Right ADC Mux' - value Stereo + value 'Digital Mono' } control.45 { comment.access 'read write' @@ -423,7 +423,7 @@ state.Spitz { comment.item.3 'Digital Mono' iface MIXER name 'Left ADC Mux' - value Stereo + value 'Digital Mono' } control.46 { comment.access 'read write' @@ -458,7 +458,7 @@ state.Spitz { comment.item.4 Differential iface MIXER name 'Right Line Mux' - value 'Line 1' + value Differential } control.49 { comment.access 'read write' @@ -471,7 +471,7 @@ state.Spitz { comment.item.4 Differential iface MIXER name 'Left Line Mux' - value 'Line 1' + value Differential } control.50 { comment.access 'read write' @@ -483,7 +483,7 @@ state.Spitz { comment.item.3 Differential iface MIXER name 'Right PGA Mux' - value 'Line 1' + value Differential } control.51 { comment.access 'read write' @@ -495,7 +495,7 @@ state.Spitz { comment.item.3 Differential iface MIXER name 'Left PGA Mux' - value 'Line 1' + value Differential } control.52 { comment.access 'read write' @@ -535,7 +535,7 @@ state.Spitz { comment.count 1 iface MIXER name 'Right Mixer Left Playback Switc' - value true + value false } control.57 { comment.access 'read write' -- cgit v1.2.3 From a31fef72ef3076a0250cc304c25f6a68ae2b9b9e Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 19 Feb 2008 23:42:47 +0000 Subject: dbus 1.1.4 fix permissions of dbus system bus activation helper binary * with this revision, system bus activation finally works --- packages/dbus/dbus.inc | 22 ++++++++++++++++------ packages/dbus/dbus_1.1.4.bb | 2 +- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/packages/dbus/dbus.inc b/packages/dbus/dbus.inc index b2ced23d99..ed0a0b3cf2 100644 --- a/packages/dbus/dbus.inc +++ b/packages/dbus/dbus.inc @@ -1,5 +1,6 @@ +DESCRIPTION = "A message bus system for inter-process communication" HOMEPAGE = "http://dbus.freedesktop.org" -DESCRIPTION = "Message bus system for applications to talk to one another" +SECTION = "base" LICENSE = "GPL" DEPENDS = "expat glib-2.0 virtual/libintl" @@ -56,13 +57,20 @@ chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER" chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER" grep -q netdev: /etc/group || addgroup netdev - +chmod u+s /usr/libexec/dbus-daemon-launch-helper } -EXTRA_OECONF = "--disable-qt --disable-qt3 --disable-gtk --disable-tests \ - --disable-checks --disable-xml-docs --disable-doxygen-docs \ - --with-xml=expat --without-x" - +EXTRA_OECONF = "\ + --disable-qt \ + --disable-qt3 \ + --disable-gtk \ + --disable-tests \ + --disable-checks \ + --disable-xml-docs \ + --disable-doxygen-docs \ + --with-xml=expat \ + --without-x \ +" do_stage() { oe_libinstall -so -C dbus libdbus-1 ${STAGING_LIBDIR} @@ -76,4 +84,6 @@ do_stage() { do_install_append() { install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1 + # the stock install seems to install the libtool wrapper script, so we have to copy this manually :M: + install -m 0755 bus/.libs/dbus-daemon-launch-helper ${D}${libexecdir}/ } diff --git a/packages/dbus/dbus_1.1.4.bb b/packages/dbus/dbus_1.1.4.bb index 8e3e329fde..7838e55ca1 100644 --- a/packages/dbus/dbus_1.1.4.bb +++ b/packages/dbus/dbus_1.1.4.bb @@ -1,3 +1,3 @@ include dbus.inc -PR = "r1" +PR = "r2" -- cgit v1.2.3 From caa7a3cfd0e36fd85c88be9b3da099623eff09a0 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 19 Feb 2008 23:43:14 +0000 Subject: gsm0710muxd svn fix name of dbus service file (temp.) --- packages/freesmartphone/gsm0710muxd_svn.bb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/freesmartphone/gsm0710muxd_svn.bb b/packages/freesmartphone/gsm0710muxd_svn.bb index 4a4dc3b7d4..98b9360c00 100644 --- a/packages/freesmartphone/gsm0710muxd_svn.bb +++ b/packages/freesmartphone/gsm0710muxd_svn.bb @@ -5,13 +5,18 @@ SECTION = "console/network" DEPENDS = "intltool-native dbus" LICENSE = "GPL" PV = "0.0+svnr${SRCREV}" -PR = "r0" +PR = "r2" SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=gsm0710muxd" S = "${WORKDIR}/gsm0710muxd" inherit autotools +do_install_append() { + # temp hack + mv -f ${D}${datadir}/dbus-1/system-services/org.freesmartphone.GSM.MUX.service ${D}${datadir}/dbus-1/system-services/org.mobile.mux.service +} + pkg_postinst_${PN}() { # can't do this offline if [ "x$D" != "x" ]; then -- cgit v1.2.3 From 20d42693b736d4986cbf898c9ef1b392a65f3f85 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Tue, 19 Feb 2008 23:53:49 +0000 Subject: zziplib: Unification and new versions. - added zziplib.inc file - added native and non-native recipe for latest stable (0.12) series - added native and non-native recipe for latest development (0.13) series --- packages/zziplib/files/.mtn2git_empty | 0 packages/zziplib/files/zip_c.patch | 15 + packages/zziplib/files/zziplib-autoconf.patch | 509 ++++++++++++++++++++++++++ packages/zziplib/zziplib-native_0.12.83.bb | 9 + packages/zziplib/zziplib-native_0.13.49.bb | 9 + packages/zziplib/zziplib.inc | 20 + packages/zziplib/zziplib_0.10.82.bb | 22 +- packages/zziplib/zziplib_0.12.83.bb | 4 + packages/zziplib/zziplib_0.13.49.bb | 12 + 9 files changed, 580 insertions(+), 20 deletions(-) create mode 100644 packages/zziplib/files/.mtn2git_empty create mode 100644 packages/zziplib/files/zip_c.patch create mode 100644 packages/zziplib/files/zziplib-autoconf.patch create mode 100644 packages/zziplib/zziplib-native_0.12.83.bb create mode 100644 packages/zziplib/zziplib-native_0.13.49.bb create mode 100644 packages/zziplib/zziplib.inc create mode 100644 packages/zziplib/zziplib_0.12.83.bb create mode 100644 packages/zziplib/zziplib_0.13.49.bb diff --git a/packages/zziplib/files/.mtn2git_empty b/packages/zziplib/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/zziplib/files/zip_c.patch b/packages/zziplib/files/zip_c.patch new file mode 100644 index 0000000000..fb23ce650e --- /dev/null +++ b/packages/zziplib/files/zip_c.patch @@ -0,0 +1,15 @@ +From zziplib Debian source package +--- a/zzip/zip.c 2007-03-19 02:27:49.000000000 +1100 ++++ b/zzip/zip.c 2007-11-07 17:40:52.985849197 +1100 +@@ -402,7 +402,10 @@ + uint16_t u_extras, u_comment, u_namlen; + + if (fd_map) +- { d = (void*)(fd_map+zz_fd_gap+zz_offset); } /* fd_map+fd_gap==u_rootseek */ ++ { ++ d = &dirent; ++ memcpy(d, fd_map+zz_fd_gap+zz_offset, sizeof(*d)); /* fd_map+fd_gap==u_rootseek */ ++ } + else + { + if (io->fd.seeks(fd, zz_rootseek+zz_offset, SEEK_SET) < 0) diff --git a/packages/zziplib/files/zziplib-autoconf.patch b/packages/zziplib/files/zziplib-autoconf.patch new file mode 100644 index 0000000000..6fc666f8f2 --- /dev/null +++ b/packages/zziplib/files/zziplib-autoconf.patch @@ -0,0 +1,509 @@ +Reworks zziplib's configure and top-level makefile considerably to make +this package compile in a cross-compilation environment. This has not +and will not be sent upstream because the author most likely wants it that +way (lots of MSVC crap). + +Index: zziplib-0.13.49/Makefile.am +=================================================================== +--- zziplib-0.13.49.orig/Makefile.am 2008-02-19 22:54:19.000000000 +0100 ++++ zziplib-0.13.49/Makefile.am 2008-02-19 23:37:40.000000000 +0100 +@@ -1,126 +1,10 @@ +-AUTOMAKE_OPTIONS = 1.4 foreign dist-bzip2 + ACLOCAL_AMFLAGS = -I m4 +-WANT_AUTOMAKE = 1.7 +-WANT_AUTOCONF = 2.57 ++WANT_AUTOMAKE = 1.96 ++WANT_AUTOCONF = 2.61 + + DIST_SUBDIRS = zzip zzipwrap bins test docs SDL + SUBDIRS = zzip zzipwrap bins test docs @SDL@ + +-# see Makefile.mk for the "make rpm" target +-rpm2: dist-bzip2 $(PACKAGE).spec +- rpmbuild -ta $(PACKAGE)-$(VERSION).tar.bz2 +- +-indent-check: +- (cd zzip && $(MAKE) `basename $@`) +- +-doc docs docu clean-doc clean-docs clean-docu zzip.html zzip.xml zzip.pdf \ +-man mans manpages htmpages unpack clean-unpack changes.htm pdfs \ +-omf install-omf install-doc install-docs install-sf install-man3 install-mans : +- (cd docs && $(MAKE) `basename $@`) +- +-sdl testsdl test-sdl install-sdl : +- (cd SDL && $(MAKE) `basename $@`) +- +-check-test0 check-test1 check-zzdir check-zzcat \ +-check-zzxor check-zzxordir check-zzxorcat \ +-check-sfx check-readme : \ +- (cd test && $(MAKE) `basename $@`) +- +-MSVC8 = msvc8/README.TXT msvc8/zip.exe msvc8/test1.zip msvc8/test.zip \ +-msvc8/zzdir.vcproj msvc8/zzipself.vcproj msvc8/zzip.vcproj \ +-msvc8/zziplib.sln msvc8/zzipsetstub.sln msvc8/zzobfuscated.sln \ +-msvc8/zziplib.vcproj msvc8/zzipsetstub.vcproj msvc8/zzobfuscated.vcproj \ +-msvc8/zzcat.sln msvc8/zzipself.bat msvc8/zzip.sln \ +-msvc8/zzcat.vcproj msvc8/zzipself.sln msvc8/zziptest.sln \ +-msvc8/zzdir.sln msvc8/zzipself.txt msvc8/zziptest.vcproj \ +- msvc8/zzipfseeko.vcproj msvc8/zzipmmapped.vcproj +- +-MSVC7 = msvc7/pkzip.exe msvc7/test1.zip msvc7/test.zip \ +-msvc7/zzdir.vcproj msvc7/zzipself.vcproj msvc7/zzip.vcproj \ +-msvc7/zziplib.sln msvc7/zzipsetstub.sln msvc7/zzobfuscated.sln \ +-msvc7/zziplib.vcproj msvc7/zzipsetstub.vcproj msvc7/zzobfuscated.vcproj \ +-msvc7/zzcat.sln msvc7/zzipself.bat msvc7/zzip.sln \ +-msvc7/zzcat.vcproj msvc7/zzipself.sln msvc7/zziptest.sln \ +-msvc7/zzdir.sln msvc7/zzipself.txt msvc7/zziptest.vcproj +- +-MSVC6 = \ +-msvc6/zzcat.dsp msvc6/zziplib.dsp msvc6/zzipwrap.dsp \ +-msvc6/zzdir.dsp msvc6/zziplib.dsw msvc6/zzobfuscated.dsp \ +-msvc6/zziptest.dsp msvc6/zzip.dsp +- + EXTRA_DIST = zziplib.spec zzipback.sed Makefile.mk \ +- $(MSVC8) $(MSVC7) $(MSVC6) $(am__aclocal_m4_deps) +- +-PHONY = auto boottrap rpm doc docs man manpages htmpages sdl testsdl \ +- comp compats msvc6 msvc7 +-# ------------------------------------------------------------------------ +- +-test-comp: +- test ! -d testing || rm -r testing +- mkdir testing +- (cd testing && tar xzvf ../$(PACKAGE)-$(VERSION).tar.gz) +- (cd "testing/$(PACKAGE)-$(VERSION)/zziplib" && sh configure) +- $(MAKE) -C "testing/$(PACKAGE)-$(VERSION)/zziplib" +- $(MAKE) -C "testing/$(PACKAGE)-$(VERSION)/zziplib" check +- +-clean-comp: +- test ! -d testing || rm -r testing +- +-msvc : +- mkdir bin +- mkdir lib +- mkdir include +- mkdir include/zzip +- cp $(srcdir)/msvc6/Release/*.exe bin/ +- cp $(srcdir)/msvc6/Release/*.dll bin/ +- cp $(srcdir)/msvc6/Release/*.lib lib/ +- cp $(srcdir)/zzip/*.h include/zzip/ +- zip -9r $(srcdir)/$(PACKAGE)-$(VERSION)-msvc6-bin.zip bin/ +- zip -9r $(srcdir)/$(PACKAGE)-$(VERSION)-msvc6-lib.zip lib/ include/ +- rm -r bin lib include +- +-# ------------------------------------------------------------------ zzip64 +-_FILE_OFFSET64 = -D_ZZIP_LARGEFILE -D_FILE_OFFSET_BITS=64 +-_RELEASEINFO64 = "RELEASE_INFO=-release 0-64" ++ $(am__aclocal_m4_deps) + +-zzip64-setup: zzip64-setup.tmp +-zzip64-setup.tmp : zzip/Makefile zzip/_config.h zzip/.deps/* zzip/zziplib.pc +- - mkdir zzip64 +- cp -a zzip/Makefile zzip/_config.h zzip/.deps/ zzip/zziplib.pc zzip64/ +- date > zzip64.dir +-zzip64-build: zzip64-build.tmp +-zzip64-build.tmp : zzip64-setup.tmp $(top_srcdir)/zzip/* +- cd zzip64 && $(MAKE) "AM_CFLAGS=$(_FILE_OFFSET64)" $(_RELEASEINFO64) +-zzip64-install: zzip64-install.tmp +-zzip64-install.tmp : zzip64-build.tmp +- cd zzip64 && $(MAKE) install $(_RELEASEINFO64) +- cd $(DESTDIR)$(libdir) && mv libzzip.so libzzip64.so +- cd $(DESTDIR)$(libdir) && mv libzzip.a libzzip64.a +- cd $(DESTDIR)$(libdir) && \ +- sed -e 's/zzip.so/zzip64.so/' \ +- -e 's/zzip.a/zzip64.a/' libzzip.la > libzzip64.la +- cd $(DESTDIR)$(libdir)/pkgconfig && \ +- sed -e 's/largefile=/largefile= %_FILE_OFFSET64/' \ +- -e 's/-lzzip/-lzzip64/' \ +- -e 's/zziplib/zziplib64/' zziplib.pc > zziplib64.pc +-zzip32-postinstall: +- cd $(DESTDIR)$(libdir) && mv libzzip.so libzzip32.so +- cd $(DESTDIR)$(libdir) && mv libzzip.a libzzip32.a +- cd $(DESTDIR)$(libdir) && ln -s libzzip32.so libzzip.so +- cd $(DESTDIR)$(libdir) && ln -s libzzip32.a libzzip.a +- cd $(DESTDIR)$(libdir) && \ +- sed -e 's/zzip.so/zzip32.so/' \ +- -e 's/zzip.a/zzip32.a/' libzzip.la > libzzip32.la +- cd $(DESTDIR)$(libdir)/pkgconfig && \ +- sed -e 's/-lzzip/-lzzip32/' \ +- -e 's/zziplib/zziplib32/' zziplib.pc > zziplib32.pc +-zzip-postinstall: +- : "the 12.8x and 11.8x and 10.8x packages are all the same actually" +- cd $(DESTDIR)$(libdir) || exit 1 \ +- ; for i in libzzip*.so.1? ; do : \ +- ; v10=`echo $i | sed -e "s/.so.../.so.10/"` \ +- ; v11=`echo $i | sed -e "s/.so.../.so.11/"` \ +- ; v12=`echo $i | sed -e "s/.so.../.so.12/"` \ +- ; test ! -e $v10 && test -e $v12 && ln -s $v12 $v10 \ +- ; test ! -e $v12 && test -e $v10 && ln -s $v10 $v12 \ +- ; ln -s $v10 $v11 || true; done +Index: zziplib-0.13.49/configure.ac +=================================================================== +--- zziplib-0.13.49.orig/configure.ac 2008-02-15 21:56:37.000000000 +0100 ++++ zziplib-0.13.49/configure.ac 2008-02-19 23:43:05.000000000 +0100 +@@ -1,12 +1,12 @@ +-AC_INIT(zziplib.spec) +-AC_PREREQ(2.49) +-AC_COPYRIGHT([Guido Draheim for ZZipLib.SF.net]) ++AC_PREREQ(2.61) ++AC_INIT([zziplib], [0.13.49], [Guido Draheim ]) ++AC_CANONICAL_TARGET ++AM_INIT_AUTOMAKE([foreign 1.9 dist-bzip2]) ++ ++AC_CONFIG_SRCDIR([zzip/zip.c]) + AC_REVISION($Revision: 1.9 $) +-AC_CONFIG_AUX_DIR(uses) ++ + # ======================================================================= +-AC_CANONICAL_SYSTEM +-dnl AM_ENABLE_MULTILIB([Makefile],[$host]) +-AX_ENABLE_BUILDDIR_UNAME + AC_SET_DEFAULT_PATHS_SYSTEM + # ----------------------------------------------------------------------- + AC_ARG_ENABLE(thread-safe,AC_HELP_STRING( +@@ -61,8 +61,6 @@ + AC_SUBST(ZLIB_INCL) + AC_SUBST(ZLIB_LDIR) + # ----------------------------------------------------------------------- +-AX_SPEC_DEFAULTS +-AM_INIT_AUTOMAKE($PACKAGE,$VERSION) + dnl test ".$CFLAGS" = "." && CFLAGS="" + AC_PROG_CC + dnl test ".$CFLAGS" = "." && test "$GCC" = "yes" && CFLAGS="-O3" +@@ -77,7 +75,7 @@ + sed -f $srcdir/zzip/_msvc.sed $srcdir/config.h.in >zzip/_msvc.in + AC_CONFIG_HEADERS([config.h]) + AX_PREFIX_CONFIG_H([zzip/_config.h],[zzip],[config.h]) +-AX_PREFIX_CONFIG_H([zzip/_msvc.h],[zzip],[zzip/_msvc.in]) ++#AX_PREFIX_CONFIG_H([zzip/_msvc.h],[zzip],[zzip/_msvc.in]) + AM_MAINTAINER_MODE + + AX_CREATE_PKGCONFIG_INFO(dnl +Index: zziplib-0.13.49/install-sh +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ zziplib-0.13.49/install-sh 2008-02-19 23:43:36.000000000 +0100 +@@ -0,0 +1,323 @@ ++#!/bin/sh ++# install - install a program, script, or datafile ++ ++scriptversion=2005-05-14.22 ++ ++# This originates from X11R5 (mit/util/scripts/install.sh), which was ++# later released in X11R6 (xc/config/util/install.sh) with the ++# following copyright and license. ++# ++# Copyright (C) 1994 X Consortium ++# ++# Permission is hereby granted, free of charge, to any person obtaining a copy ++# of this software and associated documentation files (the "Software"), to ++# deal in the Software without restriction, including without limitation the ++# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or ++# sell copies of the Software, and to permit persons to whom the Software is ++# furnished to do so, subject to the following conditions: ++# ++# The above copyright notice and this permission notice shall be included in ++# all copies or substantial portions of the Software. ++# ++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ++# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- ++# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++# ++# Except as contained in this notice, the name of the X Consortium shall not ++# be used in advertising or otherwise to promote the sale, use or other deal- ++# ings in this Software without prior written authorization from the X Consor- ++# tium. ++# ++# ++# FSF changes to this file are in the public domain. ++# ++# Calling this script install-sh is preferred over install.sh, to prevent ++# `make' implicit rules from creating a file called install from it ++# when there is no Makefile. ++# ++# This script is compatible with the BSD install script, but was written ++# from scratch. It can only install one file at a time, a restriction ++# shared with many OS's install programs. ++ ++# set DOITPROG to echo to test this script ++ ++# Don't use :- since 4.3BSD and earlier shells don't like it. ++doit="${DOITPROG-}" ++ ++# put in absolute paths if you don't have them in your path; or use env. vars. ++ ++mvprog="${MVPROG-mv}" ++cpprog="${CPPROG-cp}" ++chmodprog="${CHMODPROG-chmod}" ++chownprog="${CHOWNPROG-chown}" ++chgrpprog="${CHGRPPROG-chgrp}" ++stripprog="${STRIPPROG-strip}" ++rmprog="${RMPROG-rm}" ++mkdirprog="${MKDIRPROG-mkdir}" ++ ++chmodcmd="$chmodprog 0755" ++chowncmd= ++chgrpcmd= ++stripcmd= ++rmcmd="$rmprog -f" ++mvcmd="$mvprog" ++src= ++dst= ++dir_arg= ++dstarg= ++no_target_directory= ++ ++usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE ++ or: $0 [OPTION]... SRCFILES... DIRECTORY ++ or: $0 [OPTION]... -t DIRECTORY SRCFILES... ++ or: $0 [OPTION]... -d DIRECTORIES... ++ ++In the 1st form, copy SRCFILE to DSTFILE. ++In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. ++In the 4th, create DIRECTORIES. ++ ++Options: ++-c (ignored) ++-d create directories instead of installing files. ++-g GROUP $chgrpprog installed files to GROUP. ++-m MODE $chmodprog installed files to MODE. ++-o USER $chownprog installed files to USER. ++-s $stripprog installed files. ++-t DIRECTORY install into DIRECTORY. ++-T report an error if DSTFILE is a directory. ++--help display this help and exit. ++--version display version info and exit. ++ ++Environment variables override the default commands: ++ CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG ++" ++ ++while test -n "$1"; do ++ case $1 in ++ -c) shift ++ continue;; ++ ++ -d) dir_arg=true ++ shift ++ continue;; ++ ++ -g) chgrpcmd="$chgrpprog $2" ++ shift ++ shift ++ continue;; ++ ++ --help) echo "$usage"; exit $?;; ++ ++ -m) chmodcmd="$chmodprog $2" ++ shift ++ shift ++ continue;; ++ ++ -o) chowncmd="$chownprog $2" ++ shift ++ shift ++ continue;; ++ ++ -s) stripcmd=$stripprog ++ shift ++ continue;; ++ ++ -t) dstarg=$2 ++ shift ++ shift ++ continue;; ++ ++ -T) no_target_directory=true ++ shift ++ continue;; ++ ++ --version) echo "$0 $scriptversion"; exit $?;; ++ ++ *) # When -d is used, all remaining arguments are directories to create. ++ # When -t is used, the destination is already specified. ++ test -n "$dir_arg$dstarg" && break ++ # Otherwise, the last argument is the destination. Remove it from $@. ++ for arg ++ do ++ if test -n "$dstarg"; then ++ # $@ is not empty: it contains at least $arg. ++ set fnord "$@" "$dstarg" ++ shift # fnord ++ fi ++ shift # arg ++ dstarg=$arg ++ done ++ break;; ++ esac ++done ++ ++if test -z "$1"; then ++ if test -z "$dir_arg"; then ++ echo "$0: no input file specified." >&2 ++ exit 1 ++ fi ++ # It's OK to call `install-sh -d' without argument. ++ # This can happen when creating conditional directories. ++ exit 0 ++fi ++ ++for src ++do ++ # Protect names starting with `-'. ++ case $src in ++ -*) src=./$src ;; ++ esac ++ ++ if test -n "$dir_arg"; then ++ dst=$src ++ src= ++ ++ if test -d "$dst"; then ++ mkdircmd=: ++ chmodcmd= ++ else ++ mkdircmd=$mkdirprog ++ fi ++ else ++ # Waiting for this to be detected by the "$cpprog $src $dsttmp" command ++ # might cause directories to be created, which would be especially bad ++ # if $src (and thus $dsttmp) contains '*'. ++ if test ! -f "$src" && test ! -d "$src"; then ++ echo "$0: $src does not exist." >&2 ++ exit 1 ++ fi ++ ++ if test -z "$dstarg"; then ++ echo "$0: no destination specified." >&2 ++ exit 1 ++ fi ++ ++ dst=$dstarg ++ # Protect names starting with `-'. ++ case $dst in ++ -*) dst=./$dst ;; ++ esac ++ ++ # If destination is a directory, append the input filename; won't work ++ # if double slashes aren't ignored. ++ if test -d "$dst"; then ++ if test -n "$no_target_directory"; then ++ echo "$0: $dstarg: Is a directory" >&2 ++ exit 1 ++ fi ++ dst=$dst/`basename "$src"` ++ fi ++ fi ++ ++ # This sed command emulates the dirname command. ++ dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` ++ ++ # Make sure that the destination directory exists. ++ ++ # Skip lots of stat calls in the usual case. ++ if test ! -d "$dstdir"; then ++ defaultIFS=' ++ ' ++ IFS="${IFS-$defaultIFS}" ++ ++ oIFS=$IFS ++ # Some sh's can't handle IFS=/ for some reason. ++ IFS='%' ++ set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` ++ shift ++ IFS=$oIFS ++ ++ pathcomp= ++ ++ while test $# -ne 0 ; do ++ pathcomp=$pathcomp$1 ++ shift ++ if test ! -d "$pathcomp"; then ++ $mkdirprog "$pathcomp" ++ # mkdir can fail with a `File exist' error in case several ++ # install-sh are creating the directory concurrently. This ++ # is OK. ++ test -d "$pathcomp" || exit ++ fi ++ pathcomp=$pathcomp/ ++ done ++ fi ++ ++ if test -n "$dir_arg"; then ++ $doit $mkdircmd "$dst" \ ++ && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ ++ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ ++ && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ ++ && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } ++ ++ else ++ dstfile=`basename "$dst"` ++ ++ # Make a couple of temp file names in the proper directory. ++ dsttmp=$dstdir/_inst.$$_ ++ rmtmp=$dstdir/_rm.$$_ ++ ++ # Trap to clean up those temp files at exit. ++ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 ++ trap '(exit $?); exit' 1 2 13 15 ++ ++ # Copy the file name to the temp name. ++ $doit $cpprog "$src" "$dsttmp" && ++ ++ # and set any options; do chmod last to preserve setuid bits. ++ # ++ # If any of these fail, we abort the whole thing. If we want to ++ # ignore errors from any of these, just make sure not to ignore ++ # errors from the above "$doit $cpprog $src $dsttmp" command. ++ # ++ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ ++ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ ++ && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ ++ && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && ++ ++ # Now rename the file to the real destination. ++ { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ ++ || { ++ # The rename failed, perhaps because mv can't rename something else ++ # to itself, or perhaps because mv is so ancient that it does not ++ # support -f. ++ ++ # Now remove or move aside any old file at destination location. ++ # We try this two ways since rm can't unlink itself on some ++ # systems and the destination file might be busy for other ++ # reasons. In this case, the final cleanup might fail but the new ++ # file should still install successfully. ++ { ++ if test -f "$dstdir/$dstfile"; then ++ $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ ++ || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ ++ || { ++ echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 ++ (exit 1); exit 1 ++ } ++ else ++ : ++ fi ++ } && ++ ++ # Now rename the file to the real destination. ++ $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" ++ } ++ } ++ fi || { (exit 1); exit 1; } ++done ++ ++# The final little trick to "correctly" pass the exit status to the exit trap. ++{ ++ (exit 0); exit 0 ++} ++ ++# Local variables: ++# eval: (add-hook 'write-file-hooks 'time-stamp) ++# time-stamp-start: "scriptversion=" ++# time-stamp-format: "%:y-%02m-%02d.%02H" ++# time-stamp-end: "$" ++# End: diff --git a/packages/zziplib/zziplib-native_0.12.83.bb b/packages/zziplib/zziplib-native_0.12.83.bb new file mode 100644 index 0000000000..eb954f12c1 --- /dev/null +++ b/packages/zziplib/zziplib-native_0.12.83.bb @@ -0,0 +1,9 @@ +require zziplib_${PV}.bb + +DEPENDS = "zlib-native" + +inherit native + +S = "${WORKDIR}/zziplib-${PV}" + +PACKAGES = "" diff --git a/packages/zziplib/zziplib-native_0.13.49.bb b/packages/zziplib/zziplib-native_0.13.49.bb new file mode 100644 index 0000000000..eb954f12c1 --- /dev/null +++ b/packages/zziplib/zziplib-native_0.13.49.bb @@ -0,0 +1,9 @@ +require zziplib_${PV}.bb + +DEPENDS = "zlib-native" + +inherit native + +S = "${WORKDIR}/zziplib-${PV}" + +PACKAGES = "" diff --git a/packages/zziplib/zziplib.inc b/packages/zziplib/zziplib.inc new file mode 100644 index 0000000000..602eae6315 --- /dev/null +++ b/packages/zziplib/zziplib.inc @@ -0,0 +1,20 @@ +DESCRIPTION = "Support library for dealing with zip files" +SECTION = "libs" +PRIORITY = "optional" + +DEPENDS = "zlib python-native" + +SRC_URI = "${SOURCEFORGE_MIRROR}/zziplib/zziplib-${PV}.tar.bz2" +LICENSE = "LGPL MPL" + +inherit autotools pkgconfig + +do_configure_append() { + # Fix some brokenness in the generated makefile. + sed -i \ + -e "s|tail -1|tail -n 1|" \ + -e "s|dist dist-all dist-all:|dist dist-all:|" \ + Makefile + + mkdir ${S}/build +} diff --git a/packages/zziplib/zziplib_0.10.82.bb b/packages/zziplib/zziplib_0.10.82.bb index 4fb129592e..676444c072 100644 --- a/packages/zziplib/zziplib_0.10.82.bb +++ b/packages/zziplib/zziplib_0.10.82.bb @@ -1,21 +1,3 @@ -DESCRIPTION = "Support library for dealing with zip files" -SECTION = "libs" -PRIORITY = "optional" +require zziplib.inc -SRC_URI = "${SOURCEFORGE_MIRROR}/zziplib/zziplib-${PV}.tar.bz2" -LICENSE = "LGPL MPL" -inherit autotools pkgconfig - -do_stage() { - oe_libinstall -a -so -C zzip libzzip ${STAGING_LIBDIR} - oe_libinstall -a -so -C zzipwrap libzzipwrap ${STAGING_LIBDIR} - install -d ${STAGING_DATADIR}/aclocal - install -m 0644 ${S}/bins/zziplib.m4 ${STAGING_DATADIR}/aclocal/ - for h in zzip.h zzipformat.h zzipwrap.h zziplib.h zzip-io.h; do - install -m 0644 ${S}/zziplib/$h ${STAGING_INCDIR}/ - done - install -d ${STAGING_INCDIR}/zzip - for h in lib.h format.h _msvc.h conf.h file.h stdint.h zzip.h _config.h plugin.h; do - install -m 0644 ${S}/zzip/$h ${STAGING_INCDIR}/zzip/ - done -} +PR = "r1" diff --git a/packages/zziplib/zziplib_0.12.83.bb b/packages/zziplib/zziplib_0.12.83.bb new file mode 100644 index 0000000000..c9078ac6b6 --- /dev/null +++ b/packages/zziplib/zziplib_0.12.83.bb @@ -0,0 +1,4 @@ +require zziplib.inc + +SRC_URI += "file://zziplib-buildfix.patch;patch=1" + diff --git a/packages/zziplib/zziplib_0.13.49.bb b/packages/zziplib/zziplib_0.13.49.bb new file mode 100644 index 0000000000..3a6c148dc5 --- /dev/null +++ b/packages/zziplib/zziplib_0.13.49.bb @@ -0,0 +1,12 @@ +require zziplib.inc + +SRC_URI += "\ + file://zip_c.patch;patch=1 \ + file://zziplib-autoconf.patch;patch=1 \ + " + +#EXTRA_OECONF = "--srcdir=${S} --enable-builddir=${S}/build" + +do_stage() { + autotools_stage_all +} -- cgit v1.2.3 From c9e8762b3c2c940689bee98c2f78af69b47407e2 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Wed, 20 Feb 2008 00:34:07 +0000 Subject: gaim: moved gaim to packages/obsolete and pidgin to its own directory. Fixes 2374. --- packages/gaim/.mtn2git_empty | 0 packages/gaim/files/.mtn2git_empty | 0 .../gaim/files/01-optional-icons-in-dialogs.patch | 514 --------------------- packages/gaim/files/02-request-field-dialogs.patch | 116 ----- packages/gaim/files/03-blist-dialogs.patch | 240 ---------- packages/gaim/files/04-saved-status-dialogs.patch | 40 -- packages/gaim/files/05-statusbox-icon-size.patch | 11 - packages/gaim/files/06-account-dialogs.patch | 219 --------- packages/gaim/files/07-roomlist-dialog.patch | 67 --- packages/gaim/files/08-prefs-dialog.patch | 64 --- packages/gaim/files/09-filetransfer-dialog.patch | 52 --- packages/gaim/files/10-pda-default-settings.patch | 13 - packages/gaim/files/define-pda-mode.patch | 36 -- packages/gaim/files/desktop-name-2.0.0.patch | 27 -- packages/gaim/files/desktop-name.patch | 10 - packages/gaim/files/desktop-name_1.4.0.patch | 11 - packages/gaim/files/desktop-name_1.5.0.patch | 11 - packages/gaim/files/docklet-icon-size.patch | 13 - packages/gaim/files/gaim-OE-branding.patch | 11 - packages/gaim/files/gevolution-eds-dbus.patch | 53 --- packages/gaim/files/gtk-deprecated-2.0.0.patch | 13 - .../files/no-superimposed-version-on-logo.patch | 19 - packages/gaim/files/purple-OE-branding.patch | 14 - packages/gaim/files/series | 14 - packages/gaim/gaim.inc | 35 -- packages/gaim/gaim_1.0.3.bb | 6 - packages/gaim/gaim_1.1.0.bb | 6 - packages/gaim/gaim_1.1.1.bb | 6 - packages/gaim/gaim_1.1.2.bb | 9 - packages/gaim/gaim_1.4.0.bb | 9 - packages/gaim/gaim_1.5.0.bb | 9 - packages/gaim/gaim_2.0.0-cvs-mco1.bb | 44 -- packages/gaim/pidgin.inc | 85 ---- packages/gaim/pidgin/.mtn2git_empty | 0 packages/gaim/pidgin/gconf-no-errors.patch | 12 - packages/gaim/pidgin/pidgin.desktop-set-icon.patch | 11 - packages/gaim/pidgin/sanitize-configure.ac.patch | 33 -- packages/gaim/pidgin_2.0.2.bb | 9 - packages/gaim/pidgin_2.1.1.bb | 10 - packages/gaim/pidgin_2.2.1.bb | 10 - packages/obsolete/gaim/.mtn2git_empty | 0 packages/obsolete/gaim/files/.mtn2git_empty | 0 .../gaim/files/01-optional-icons-in-dialogs.patch | 514 +++++++++++++++++++++ .../gaim/files/02-request-field-dialogs.patch | 116 +++++ .../obsolete/gaim/files/03-blist-dialogs.patch | 240 ++++++++++ .../gaim/files/04-saved-status-dialogs.patch | 40 ++ .../gaim/files/05-statusbox-icon-size.patch | 11 + .../obsolete/gaim/files/06-account-dialogs.patch | 219 +++++++++ .../obsolete/gaim/files/07-roomlist-dialog.patch | 67 +++ packages/obsolete/gaim/files/08-prefs-dialog.patch | 64 +++ .../gaim/files/09-filetransfer-dialog.patch | 52 +++ .../gaim/files/10-pda-default-settings.patch | 13 + packages/obsolete/gaim/files/define-pda-mode.patch | 36 ++ .../obsolete/gaim/files/desktop-name-2.0.0.patch | 27 ++ packages/obsolete/gaim/files/desktop-name.patch | 10 + .../obsolete/gaim/files/desktop-name_1.4.0.patch | 11 + .../obsolete/gaim/files/desktop-name_1.5.0.patch | 11 + .../obsolete/gaim/files/docklet-icon-size.patch | 13 + .../obsolete/gaim/files/gaim-OE-branding.patch | 11 + .../obsolete/gaim/files/gevolution-eds-dbus.patch | 53 +++ .../obsolete/gaim/files/gtk-deprecated-2.0.0.patch | 13 + .../files/no-superimposed-version-on-logo.patch | 19 + packages/obsolete/gaim/files/series | 14 + packages/obsolete/gaim/gaim.inc | 35 ++ packages/obsolete/gaim/gaim_1.0.3.bb | 6 + packages/obsolete/gaim/gaim_1.1.0.bb | 6 + packages/obsolete/gaim/gaim_1.1.1.bb | 6 + packages/obsolete/gaim/gaim_1.1.2.bb | 9 + packages/obsolete/gaim/gaim_1.4.0.bb | 9 + packages/obsolete/gaim/gaim_1.5.0.bb | 9 + packages/obsolete/gaim/gaim_2.0.0-cvs-mco1.bb | 44 ++ packages/pidgin/.mtn2git_empty | 0 packages/pidgin/pidgin.inc | 85 ++++ packages/pidgin/pidgin/.mtn2git_empty | 0 packages/pidgin/pidgin/gconf-no-errors.patch | 12 + .../pidgin/pidgin/pidgin.desktop-set-icon.patch | 11 + packages/pidgin/pidgin/purple-OE-branding.patch | 14 + packages/pidgin/pidgin/sanitize-configure.ac.patch | 33 ++ packages/pidgin/pidgin_2.0.2.bb | 9 + packages/pidgin/pidgin_2.1.1.bb | 10 + packages/pidgin/pidgin_2.2.1.bb | 10 + 81 files changed, 1862 insertions(+), 1862 deletions(-) delete mode 100644 packages/gaim/.mtn2git_empty delete mode 100644 packages/gaim/files/.mtn2git_empty delete mode 100644 packages/gaim/files/01-optional-icons-in-dialogs.patch delete mode 100644 packages/gaim/files/02-request-field-dialogs.patch delete mode 100644 packages/gaim/files/03-blist-dialogs.patch delete mode 100644 packages/gaim/files/04-saved-status-dialogs.patch delete mode 100644 packages/gaim/files/05-statusbox-icon-size.patch delete mode 100644 packages/gaim/files/06-account-dialogs.patch delete mode 100644 packages/gaim/files/07-roomlist-dialog.patch delete mode 100644 packages/gaim/files/08-prefs-dialog.patch delete mode 100644 packages/gaim/files/09-filetransfer-dialog.patch delete mode 100644 packages/gaim/files/10-pda-default-settings.patch delete mode 100644 packages/gaim/files/define-pda-mode.patch delete mode 100644 packages/gaim/files/desktop-name-2.0.0.patch delete mode 100644 packages/gaim/files/desktop-name.patch delete mode 100644 packages/gaim/files/desktop-name_1.4.0.patch delete mode 100644 packages/gaim/files/desktop-name_1.5.0.patch delete mode 100644 packages/gaim/files/docklet-icon-size.patch delete mode 100644 packages/gaim/files/gaim-OE-branding.patch delete mode 100644 packages/gaim/files/gevolution-eds-dbus.patch delete mode 100644 packages/gaim/files/gtk-deprecated-2.0.0.patch delete mode 100644 packages/gaim/files/no-superimposed-version-on-logo.patch delete mode 100644 packages/gaim/files/purple-OE-branding.patch delete mode 100644 packages/gaim/files/series delete mode 100644 packages/gaim/gaim.inc delete mode 100644 packages/gaim/gaim_1.0.3.bb delete mode 100644 packages/gaim/gaim_1.1.0.bb delete mode 100644 packages/gaim/gaim_1.1.1.bb delete mode 100644 packages/gaim/gaim_1.1.2.bb delete mode 100644 packages/gaim/gaim_1.4.0.bb delete mode 100644 packages/gaim/gaim_1.5.0.bb delete mode 100644 packages/gaim/gaim_2.0.0-cvs-mco1.bb delete mode 100644 packages/gaim/pidgin.inc delete mode 100644 packages/gaim/pidgin/.mtn2git_empty delete mode 100644 packages/gaim/pidgin/gconf-no-errors.patch delete mode 100644 packages/gaim/pidgin/pidgin.desktop-set-icon.patch delete mode 100644 packages/gaim/pidgin/sanitize-configure.ac.patch delete mode 100644 packages/gaim/pidgin_2.0.2.bb delete mode 100644 packages/gaim/pidgin_2.1.1.bb delete mode 100644 packages/gaim/pidgin_2.2.1.bb create mode 100644 packages/obsolete/gaim/.mtn2git_empty create mode 100644 packages/obsolete/gaim/files/.mtn2git_empty create mode 100644 packages/obsolete/gaim/files/01-optional-icons-in-dialogs.patch create mode 100644 packages/obsolete/gaim/files/02-request-field-dialogs.patch create mode 100644 packages/obsolete/gaim/files/03-blist-dialogs.patch create mode 100644 packages/obsolete/gaim/files/04-saved-status-dialogs.patch create mode 100644 packages/obsolete/gaim/files/05-statusbox-icon-size.patch create mode 100644 packages/obsolete/gaim/files/06-account-dialogs.patch create mode 100644 packages/obsolete/gaim/files/07-roomlist-dialog.patch create mode 100644 packages/obsolete/gaim/files/08-prefs-dialog.patch create mode 100644 packages/obsolete/gaim/files/09-filetransfer-dialog.patch create mode 100644 packages/obsolete/gaim/files/10-pda-default-settings.patch create mode 100644 packages/obsolete/gaim/files/define-pda-mode.patch create mode 100644 packages/obsolete/gaim/files/desktop-name-2.0.0.patch create mode 100644 packages/obsolete/gaim/files/desktop-name.patch create mode 100644 packages/obsolete/gaim/files/desktop-name_1.4.0.patch create mode 100644 packages/obsolete/gaim/files/desktop-name_1.5.0.patch create mode 100644 packages/obsolete/gaim/files/docklet-icon-size.patch create mode 100644 packages/obsolete/gaim/files/gaim-OE-branding.patch create mode 100644 packages/obsolete/gaim/files/gevolution-eds-dbus.patch create mode 100644 packages/obsolete/gaim/files/gtk-deprecated-2.0.0.patch create mode 100644 packages/obsolete/gaim/files/no-superimposed-version-on-logo.patch create mode 100644 packages/obsolete/gaim/files/series create mode 100644 packages/obsolete/gaim/gaim.inc create mode 100644 packages/obsolete/gaim/gaim_1.0.3.bb create mode 100644 packages/obsolete/gaim/gaim_1.1.0.bb create mode 100644 packages/obsolete/gaim/gaim_1.1.1.bb create mode 100644 packages/obsolete/gaim/gaim_1.1.2.bb create mode 100644 packages/obsolete/gaim/gaim_1.4.0.bb create mode 100644 packages/obsolete/gaim/gaim_1.5.0.bb create mode 100644 packages/obsolete/gaim/gaim_2.0.0-cvs-mco1.bb create mode 100644 packages/pidgin/.mtn2git_empty create mode 100644 packages/pidgin/pidgin.inc create mode 100644 packages/pidgin/pidgin/.mtn2git_empty create mode 100644 packages/pidgin/pidgin/gconf-no-errors.patch create mode 100644 packages/pidgin/pidgin/pidgin.desktop-set-icon.patch create mode 100644 packages/pidgin/pidgin/purple-OE-branding.patch create mode 100644 packages/pidgin/pidgin/sanitize-configure.ac.patch create mode 100644 packages/pidgin/pidgin_2.0.2.bb create mode 100644 packages/pidgin/pidgin_2.1.1.bb create mode 100644 packages/pidgin/pidgin_2.2.1.bb diff --git a/packages/gaim/.mtn2git_empty b/packages/gaim/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gaim/files/.mtn2git_empty b/packages/gaim/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gaim/files/01-optional-icons-in-dialogs.patch b/packages/gaim/files/01-optional-icons-in-dialogs.patch deleted file mode 100644 index 260dcf364f..0000000000 --- a/packages/gaim/files/01-optional-icons-in-dialogs.patch +++ /dev/null @@ -1,514 +0,0 @@ -Index: gaim/src/gtkblist.c -=================================================================== ---- gaim.orig/src/gtkblist.c 2005-08-19 23:23:45.000000000 +0200 -+++ gaim/src/gtkblist.c 2005-08-21 02:32:13.989658832 +0200 -@@ -873,16 +873,23 @@ - void - gaim_gtk_blist_joinchat_show(void) - { -- GtkWidget *hbox, *vbox; -+ GtkWidget *vbox; - GtkWidget *rowbox; - GtkWidget *label; -+ GtkWidget *pri_label; - GaimGtkBuddyList *gtkblist; -+ GtkWidget *sw; -+#if ICONS_IN_DIALOGS -+ GtkWidget *hbox; - GtkWidget *img = NULL; -+#endif - GaimGtkJoinChatData *data = NULL; - - gtkblist = GAIM_GTK_BLIST(gaim_get_blist()); -+#if ICONS_IN_DIALOGS - img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION, - GTK_ICON_SIZE_DIALOG); -+#endif - data = g_new0(GaimGtkJoinChatData, 1); - - data->window = gtk_dialog_new_with_buttons(_("Join a Chat"), -@@ -897,6 +904,7 @@ - GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), GAIM_HIG_BOX_SPACE); - gtk_window_set_role(GTK_WINDOW(data->window), "join_chat"); - -+#if ICONS_IN_DIALOGS - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); - gtk_container_add(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), hbox); - gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); -@@ -905,6 +913,9 @@ - vbox = gtk_vbox_new(FALSE, 5); - gtk_container_set_border_width(GTK_CONTAINER(vbox), 0); - gtk_container_add(GTK_CONTAINER(hbox), vbox); -+#else -+ vbox = GTK_DIALOG(data->window)->vbox; -+#endif - - label = gtk_label_new(_("Please enter the appropriate information " - "about the chat you would like to join.\n")); -@@ -4304,9 +4315,13 @@ - { - GtkWidget *table; - GtkWidget *label; -+ GtkWidget *pri_label; - GtkWidget *hbox; - GtkWidget *vbox; -+ GtkWidget *sw; -+#if ICONS_IN_DIALOGS - GtkWidget *img; -+#endif - GaimGtkBuddyList *gtkblist; - GaimGtkAddBuddyData *data = g_new0(GaimGtkAddBuddyData, 1); - -@@ -4315,8 +4330,10 @@ - ? account - : gaim_connection_get_account(gaim_connections_get_all()->data)); - -+#if ICONS_IN_DIALOGS - img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION, - GTK_ICON_SIZE_DIALOG); -+#endif - - gtkblist = GAIM_GTK_BLIST(gaim_get_blist()); - -@@ -4335,6 +4352,7 @@ - gtk_window_set_type_hint(GTK_WINDOW(data->window), - GDK_WINDOW_TYPE_HINT_DIALOG); - -+#if ICONS_IN_DIALOGS - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); - gtk_container_add(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), hbox); - gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); -@@ -4342,6 +4360,9 @@ - - vbox = gtk_vbox_new(FALSE, 0); - gtk_container_add(GTK_CONTAINER(hbox), vbox); -+#else -+ vbox = GTK_DIALOG(data->window)->vbox; -+#endif - - label = gtk_label_new( - _("Please enter the screen name of the person you would like " -@@ -4663,10 +4684,14 @@ - GList *l; - GaimConnection *gc; - GtkWidget *label; -+ GtkWidget *pri_label; - GtkWidget *rowbox; -- GtkWidget *hbox; - GtkWidget *vbox; -+ GtkWidget *sw; -+#if ICONS_IN_DIALOGS -+ GtkWidget *hbox; - GtkWidget *img; -+#endif - - if (account != NULL) { - gc = gaim_account_get_connection(account); -@@ -4698,8 +4723,10 @@ - data->account = account; - data->default_chat_name = g_strdup(name); - -+#if ICONS_IN_DIALOGS - img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION, - GTK_ICON_SIZE_DIALOG); -+#endif - - gtkblist = GAIM_GTK_BLIST(gaim_get_blist()); - -@@ -4720,6 +4747,7 @@ - gtk_window_set_type_hint(GTK_WINDOW(data->window), - GDK_WINDOW_TYPE_HINT_DIALOG); - -+#if ICONS_IN_DIALOGS - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); - gtk_container_add(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), hbox); - gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); -@@ -4727,6 +4755,9 @@ - - vbox = gtk_vbox_new(FALSE, 5); - gtk_container_add(GTK_CONTAINER(hbox), vbox); -+#else -+ vbox = GTK_DIALOG(data->window)->vbox; -+#endif - - label = gtk_label_new( - _("Please enter an alias, and the appropriate information " -Index: gaim/src/gtkconn.c -=================================================================== ---- gaim.orig/src/gtkconn.c 2005-08-19 23:23:45.000000000 +0200 -+++ gaim/src/gtkconn.c 2005-08-19 23:27:18.000000000 +0200 -@@ -371,7 +371,10 @@ - - /* Build the window if it isn't there yet */ - if (!disconnect_window) { -- GtkWidget *hbox, *vbox, *img; -+ GtkWidget *hbox, *vbox; -+ #if ICONS_IN_DIALOGS -+ GtkWidget *img; -+ #endif - GtkCellRenderer *rend, *rend2; - - disconnect_window = g_new0(struct disconnect_window, 1); -@@ -384,6 +387,7 @@ - gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(disconnect_window->window)->vbox), GAIM_HIG_BORDER); - gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(disconnect_window->window)->vbox), GAIM_HIG_BOX_SPACE); - -+#if ICONS_IN_DIALOGS - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); - gtk_container_add(GTK_CONTAINER(GTK_DIALOG(disconnect_window->window)->vbox), hbox); - img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_ERROR, GTK_ICON_SIZE_DIALOG); -@@ -392,6 +396,9 @@ - - vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); - gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0); -+#else -+ vbox = GTK_DIALOG(disconnect_window->window)->vbox; -+#endif - - disconnect_window->label = gtk_label_new(label_text); - -Index: gaim/src/gtkconv.c -=================================================================== ---- gaim.orig/src/gtkconv.c 2005-08-19 23:23:45.000000000 +0200 -+++ gaim/src/gtkconv.c 2005-08-19 23:27:18.000000000 +0200 -@@ -847,10 +847,12 @@ - GtkWidget *label; - GtkWidget *vbox, *hbox; - GtkWidget *table; -+#if ICONS_IN_DIALOGS - GtkWidget *img; - - img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION, - GTK_ICON_SIZE_DIALOG); -+#endif - - info = g_new0(InviteBuddyInfo, 1); - info->conv = conv; -@@ -880,6 +882,7 @@ - gtk_box_set_spacing(GTK_BOX(vbox), GAIM_HIG_BORDER); - gtk_container_set_border_width(GTK_CONTAINER(vbox), GAIM_HIG_BOX_SPACE); - -+#if ICONS_IN_DIALOGS - /* Setup the inner hbox and put the dialog's icon in it. */ - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); - gtk_container_add(GTK_CONTAINER(vbox), hbox); -@@ -889,6 +892,7 @@ - /* Setup the right vbox. */ - vbox = gtk_vbox_new(FALSE, 0); - gtk_container_add(GTK_CONTAINER(hbox), vbox); -+#endif - - /* Put our happy label in it. */ - label = gtk_label_new(_("Please enter the name of the user you wish " -@@ -1107,8 +1111,10 @@ - GaimGtkWindow *gtkwin = GAIM_GTK_WINDOW(win); - GaimGtkConversation *gtkconv = GAIM_GTK_CONVERSATION(conv); - GtkWidget *hbox; -+#if ICONS_IN_DIALOGS - GtkWidget *img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION, - GTK_ICON_SIZE_DIALOG); -+#endif - GtkWidget *label; - struct _search *s; - -@@ -1139,9 +1145,11 @@ - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); - gtk_container_add(GTK_CONTAINER(GTK_DIALOG(gtkconv->dialogs.search)->vbox), - hbox); -+#if ICONS_IN_DIALOGS - gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); - - gtk_misc_set_alignment(GTK_MISC(img), 0, 0); -+#endif - gtk_dialog_set_response_sensitive(GTK_DIALOG(gtkconv->dialogs.search), - GTK_RESPONSE_OK, FALSE); - -Index: gaim/src/gtkdebug.c -=================================================================== ---- gaim.orig/src/gtkdebug.c 2005-08-19 23:23:45.000000000 +0200 -+++ gaim/src/gtkdebug.c 2005-08-19 23:27:18.000000000 +0200 -@@ -149,7 +149,10 @@ - static void - find_cb(GtkWidget *w, DebugWindow *win) - { -- GtkWidget *hbox, *img, *label; -+ GtkWidget *hbox, *label; -+#if ICONS_IN_DIALOGS -+ GtkWidget *img; -+#endif - struct _find *f; - - if(win->find) -@@ -179,11 +182,13 @@ - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); - gtk_container_add(GTK_CONTAINER(GTK_DIALOG(win->find)->vbox), - hbox); -+#if ICONS_IN_DIALOGS - img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION, - GTK_ICON_SIZE_DIALOG); - gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); - - gtk_misc_set_alignment(GTK_MISC(img), 0, 0); -+#endif - gtk_dialog_set_response_sensitive(GTK_DIALOG(win->find), - GTK_RESPONSE_OK, FALSE); - -Index: gaim/src/gtkdialogs.c -=================================================================== ---- gaim.orig/src/gtkdialogs.c 2005-08-19 23:23:45.000000000 +0200 -+++ gaim/src/gtkdialogs.c 2005-08-19 23:27:18.000000000 +0200 -@@ -534,7 +534,9 @@ - GtkWidget *window; - GtkWidget *hbox; - GtkWidget *label; -+#if ICONS_IN_DIALOGS - GtkWidget *img; -+#endif - gchar *norm = gaim_strreplace(ee, "rocksmyworld", ""); - - label = gtk_label_new(NULL); -@@ -582,8 +584,10 @@ - - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); - gtk_container_add(GTK_CONTAINER(GTK_DIALOG(window)->vbox), hbox); -+#if ICONS_IN_DIALOGS - img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_COOL, gtk_icon_size_from_name(GAIM_ICON_SIZE_DIALOG_COOL)); - gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); -+#endif - - gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0); -Index: gaim/src/gtkgaim.h -=================================================================== ---- gaim.orig/src/gtkgaim.h 2005-08-19 23:26:29.000000000 +0200 -+++ gaim/src/gtkgaim.h 2005-08-21 02:32:29.270335816 +0200 -@@ -61,5 +61,10 @@ - #define GAIM_HIG_BORDER 12 - #define GAIM_HIG_BOX_SPACE 6 - -+/** -+ * Do we want icons in dialogs? -+ */ -+#define ICONS_IN_DIALOGS 1 -+ - #endif /* _GAIM_GTKGAIM_H_ */ - -Index: gaim/src/gtknotify.c -=================================================================== ---- gaim.orig/src/gtknotify.c 2005-08-19 23:23:45.000000000 +0200 -+++ gaim/src/gtknotify.c 2005-08-21 02:32:03.765213184 +0200 -@@ -125,7 +125,9 @@ - GtkWidget *dialog; - GtkWidget *hbox; - GtkWidget *label; -+#if ICONS_IN_DIALOGS - GtkWidget *img = NULL; -+#endif - char label_text[2048]; - const char *icon_name = NULL; - char *primary_esc, *secondary_esc; -@@ -149,11 +151,13 @@ - break; - } - -+#if ICONS_IN_DIALOGS - if (icon_name != NULL) - { - img = gtk_image_new_from_stock(icon_name, GTK_ICON_SIZE_DIALOG); - gtk_misc_set_alignment(GTK_MISC(img), 0, 0); - } -+#endif - - dialog = gtk_dialog_new_with_buttons(title ? title : GAIM_ALERT_TITLE, - NULL, 0, GTK_STOCK_CLOSE, -@@ -173,8 +177,10 @@ - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); - gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); - -+#if ICONS_IN_DIALOGS - if (img != NULL) - gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); -+#endif - - primary_esc = g_markup_escape_text(primary, -1); - secondary_esc = (secondary != NULL) ? g_markup_escape_text(secondary, -1) : NULL; -@@ -218,9 +224,11 @@ - GaimNotifyMailData *data; - GtkWidget *dialog; - GtkWidget *vbox; -- GtkWidget *hbox; - GtkWidget *label; -+#if ICONS_IN_DIALOGS -+ GtkWidget *hbox; - GtkWidget *img; -+#endif - char *detail_text; - char *label_text; - -@@ -248,6 +256,7 @@ - gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE); - gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), GAIM_HIG_BORDER); - -+#if ICONS_IN_DIALOGS - /* Setup the main horizontal box */ - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); - gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); -@@ -262,6 +271,9 @@ - vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); - - gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0); -+#else -+ vbox = GTK_DIALOG(dialog)->vbox; -+#endif - - /* Descriptive label */ - detail_text = g_strdup_printf(ngettext("%s has %d new message.", -Index: gaim/src/gtkrequest.c -=================================================================== ---- gaim.orig/src/gtkrequest.c 2005-08-19 23:23:45.000000000 +0200 -+++ gaim/src/gtkrequest.c 2005-08-21 02:32:15.943361824 +0200 -@@ -281,10 +281,12 @@ - GaimGtkRequestData *data; - GtkWidget *dialog; - GtkWidget *vbox; -- GtkWidget *hbox; - GtkWidget *label; - GtkWidget *entry; -+#if ICONS_IN_DIALOGS -+ GtkWidget *hbox; - GtkWidget *img; -+#endif - GtkWidget *toolbar; - char *label_text; - char *primary_esc, *secondary_esc; -@@ -318,6 +320,7 @@ - gtk_dialog_set_default_response(GTK_DIALOG(dialog), 0); - gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), GAIM_HIG_BORDER); - -+#if ICONS_IN_DIALOGS - /* Setup the main horizontal box */ - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); - gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); -@@ -332,6 +335,9 @@ - vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); - - gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0); -+#else -+ vbox = GTK_DIALOG(dialog)->vbox; -+#endif - - /* Descriptive label */ - primary_esc = (primary != NULL) ? g_markup_escape_text(primary, -1) : NULL; -@@ -435,9 +441,11 @@ - GaimGtkRequestData *data; - GtkWidget *dialog; - GtkWidget *vbox, *vbox2; -- GtkWidget *hbox; - GtkWidget *label; -+#if ICONS_IN_DIALOGS -+ GtkWidget *hbox; - GtkWidget *img; -+#endif - GtkWidget *radio = NULL; - char *label_text; - char *radio_text; -@@ -475,6 +483,7 @@ - gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE); - gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), GAIM_HIG_BORDER); - -+#if ICONS_IN_DIALOGS - /* Setup the main horizontal box */ - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); - gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); -@@ -488,6 +497,9 @@ - /* Vertical box */ - vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); - gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0); -+#else -+ vbox = GTK_DIALOG(dialog)->vbox; -+#endif - - /* Descriptive label */ - primary_esc = (primary != NULL) ? g_markup_escape_text(primary, -1) : NULL; -@@ -536,9 +548,11 @@ - GaimGtkRequestData *data; - GtkWidget *dialog; - GtkWidget *vbox; -- GtkWidget *hbox; - GtkWidget *label; -+#if ICONS_IN_DIALOGS -+ GtkWidget *hbox; - GtkWidget *img; -+#endif - void **buttons; - char *label_text; - char *primary_esc, *secondary_esc; -@@ -584,6 +598,7 @@ - gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE); - gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), GAIM_HIG_BORDER); - -+#if ICONS_IN_DIALOGS - /* Setup the main horizontal box */ - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); - gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); -@@ -597,7 +612,10 @@ - /* Vertical box */ - vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); - gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0); -- -+#else -+ vbox = GTK_DIALOG(dialog)->vbox; -+#endif -+ - /* Descriptive label */ - primary_esc = (primary != NULL) ? g_markup_escape_text(primary, -1) : NULL; - secondary_esc = (secondary != NULL) ? g_markup_escape_text(secondary, -1) : NULL; -@@ -620,10 +638,12 @@ - - - if (default_action == GAIM_DEFAULT_ACTION_NONE) { -+#if ICONS_IN_DIALOGS - GTK_WIDGET_SET_FLAGS(img, GTK_CAN_DEFAULT); - GTK_WIDGET_SET_FLAGS(img, GTK_CAN_FOCUS); - gtk_widget_grab_focus(img); - gtk_widget_grab_default(img); -+#endif - } else - gtk_dialog_set_default_response(GTK_DIALOG(dialog), default_action); - -@@ -1351,13 +1371,15 @@ - GtkWidget *win; - GtkWidget *vbox; - GtkWidget *vbox2; -- GtkWidget *hbox; - GtkWidget *bbox; - GtkWidget *frame; - GtkWidget *label; - GtkWidget *table; - GtkWidget *button; -+#if ICONS_IN_DIALOGS -+ GtkWidget *hbox; - GtkWidget *img; -+#endif - GtkWidget *sw; - GtkSizeGroup *sg; - GList *gl, *fl; -@@ -1392,6 +1414,7 @@ - g_signal_connect(G_OBJECT(win), "delete_event", - G_CALLBACK(destroy_multifield_cb), data); - -+#if ICONS_IN_DIALOGS - /* Setup the main horizontal box */ - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); - gtk_container_add(GTK_CONTAINER(win), hbox); -@@ -1407,6 +1430,10 @@ - /* Setup the vbox */ - vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); - gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0); -+#else -+ vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); -+ gtk_container_add(GTK_CONTAINER(win), vbox); -+#endif - gtk_widget_show(vbox); - - sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); diff --git a/packages/gaim/files/02-request-field-dialogs.patch b/packages/gaim/files/02-request-field-dialogs.patch deleted file mode 100644 index 50529ca53e..0000000000 --- a/packages/gaim/files/02-request-field-dialogs.patch +++ /dev/null @@ -1,116 +0,0 @@ -Identiske underkataloger: src2/CVS og src/CVS -Identiske underkataloger: src2/.deps og src/.deps -Index: gaim/src/gtkgaim.h -=================================================================== ---- gaim.orig/src/gtkgaim.h 2005-08-19 21:46:09.550560256 +0200 -+++ gaim/src/gtkgaim.h 2005-08-19 21:47:37.276223928 +0200 -@@ -66,5 +66,11 @@ - */ - #define ICONS_IN_DIALOGS 0 - -+/** -+ * How many fields is there screen-space for vertically, before a scrollbar is needed? -+ */ -+#define VERT_ITEMS 0 -+ -+ - #endif /* _GAIM_GTKGAIM_H_ */ - -Index: gaim/src/gtkrequest.c -=================================================================== ---- gaim.orig/src/gtkrequest.c 2005-08-19 21:46:09.550560256 +0200 -+++ gaim/src/gtkrequest.c 2005-08-19 21:53:46.782050504 +0200 -@@ -1381,6 +1381,8 @@ - GtkWidget *img; - #endif - GtkWidget *sw; -+ GtkWidget *pri_label; -+ GtkWidget *sec_label; - GtkSizeGroup *sg; - GList *gl, *fl; - GaimRequestFieldGroup *group; -@@ -1450,6 +1452,7 @@ - gtk_misc_set_alignment(GTK_MISC(label), 0, 0); - gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0); - gtk_widget_show(label); -+ pri_label = label; - g_free(label_text); - } - -@@ -1457,7 +1460,7 @@ - gl = gl->next) - total_fields += g_list_length(gaim_request_field_group_get_fields(gl->data)); - -- if(total_fields > 9) { -+ if(total_fields > VERT_ITEMS) { - sw = gtk_scrolled_window_new(NULL, NULL); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), - GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); -@@ -1484,6 +1487,7 @@ - gtk_misc_set_alignment(GTK_MISC(label), 0, 0); - gtk_box_pack_start(GTK_BOX(vbox2), label, TRUE, TRUE, 0); - gtk_widget_show(label); -+ sec_label = label; - } - - for (gl = gaim_request_fields_get_groups(fields); -@@ -1718,6 +1722,59 @@ - - gtk_widget_show(win); - -+ //Wait for the window to have recieved its "configure_event", -+ //which means it has been resized by the WM -+ while (gtk_events_pending ()) gtk_main_iteration (); -+ -+ //Get allocated size, and adjust widgets accordingly -+ int w, h, field_labels_w; -+ GtkRequisition sg_labels_req; -+ gtk_window_get_size(GTK_WINDOW(win), &w, &h); -+ field_labels_w = label->allocation.width + GAIM_HIG_BORDER*2; //The width of the largest field-label -+ -+ printf("%d / %d\n", field_labels_w, w); -+ -+ w = w - GAIM_HIG_BORDER * 2; -+ if (primary) gtk_widget_set_size_request(GTK_WIDGET(pri_label), w, -1); -+ if (secondary) gtk_widget_set_size_request(GTK_WIDGET(sec_label), w, -1); -+ -+ //Determine what to do - add a scrollbar or resize the input fields? -+ if ((float)field_labels_w / w > 0.5) //if the labels fill more than half the screen add a horizontal scrollbar -+ { -+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), -+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); -+ } -+ else //resize the input fields -+ { -+ for (gl = gaim_request_fields_get_groups(fields); -+ gl != NULL; -+ gl = gl->next) -+ { -+ GList *field_list; -+ size_t field_count = 0; -+ size_t cols = 1; -+ size_t rows; -+ size_t col_num; -+ size_t row_num = 0; -+ -+ group = gl->data; -+ field_list = gaim_request_field_group_get_fields(group); -+ -+ for (row_num = 0, fl = field_list; -+ row_num < rows && fl != NULL; -+ row_num++) -+ { -+ for (col_num = 0; -+ col_num < cols && fl != NULL; -+ col_num++, fl = fl->next) -+ { -+ field = fl->data; -+ gtk_widget_set_size_request(GTK_WIDGET(field->ui_data), w-field_labels_w, -1); -+ } -+ } -+ } -+ } -+ - return data; - } - diff --git a/packages/gaim/files/03-blist-dialogs.patch b/packages/gaim/files/03-blist-dialogs.patch deleted file mode 100644 index 62d4710d46..0000000000 --- a/packages/gaim/files/03-blist-dialogs.patch +++ /dev/null @@ -1,240 +0,0 @@ -Identiske underkataloger: src2/CVS og src/CVS -Identiske underkataloger: src2/.deps og src/.deps -Index: gaim/src/gtkblist.c -=================================================================== ---- gaim.orig/src/gtkblist.c 2005-08-19 21:57:30.272074856 +0200 -+++ gaim/src/gtkblist.c 2005-08-19 21:57:42.030287336 +0200 -@@ -825,6 +825,15 @@ - joinchat_set_sensitive_if_input_cb(NULL, data); - - gtk_widget_show_all(data->entries_box); -+ -+ GList* children; -+ children = GTK_BOX(data->entries_box)->children; -+ while (children) -+ { -+ //Let the prilabel handle the maxsize -+ gtk_widget_set_size_request(((GtkBoxChild*)(children->data))->widget, 0, -1); -+ children = children->next; -+ } - } - - static void -@@ -916,12 +925,26 @@ - #else - vbox = GTK_DIALOG(data->window)->vbox; - #endif -+ -+ //Make a scrollview to accomodate it all -+ sw = gtk_scrolled_window_new(NULL, NULL); -+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), -+ GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); -+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), -+ GTK_SHADOW_NONE); -+ gtk_widget_set_size_request(sw, -1, 200); -+ gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0); -+ gtk_widget_show(sw); -+ -+ vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); -+ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw), vbox); - - label = gtk_label_new(_("Please enter the appropriate information " - "about the chat you would like to join.\n")); - gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0); - gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); -+ pri_label = label; - - rowbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); - gtk_box_pack_start(GTK_BOX(vbox), rowbox, TRUE, TRUE, 0); -@@ -955,6 +978,22 @@ - g_object_unref(data->sg); - - gtk_widget_show_all(data->window); -+ -+ //Wait for the window to have recieved its "configure_event", -+ //which means it has been resized by the WM -+ while (gtk_events_pending ()) gtk_main_iteration (); -+ -+ //Get allocated size, and adjust widgets accordingly -+ int w, h; -+ gtk_window_get_size(GTK_WINDOW(data->window), &w, &h); -+ -+ // Window_border Scrollbar (FFH) -+ w = w - GAIM_HIG_BORDER * 2 - GAIM_HIG_BORDER * 4; -+ gtk_widget_set_size_request(GTK_WIDGET(pri_label), w, -1); -+ -+ //Let the prilabel handle the maxsize -+ gtk_widget_set_size_request(GTK_WIDGET(data->account_menu), 0, -1); -+ gtk_widget_set_size_request(GTK_WIDGET(data->entries_box), 0, -1); - } - - static void gtk_blist_row_expanded_cb(GtkTreeView *tv, GtkTreeIter *iter, GtkTreePath *path, gpointer user_data) { -@@ -4364,6 +4403,19 @@ - vbox = GTK_DIALOG(data->window)->vbox; - #endif - -+ //Make a scrollview to accomodate it all -+ sw = gtk_scrolled_window_new(NULL, NULL); -+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), -+ GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); -+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), -+ GTK_SHADOW_NONE); -+ gtk_widget_set_size_request(sw, -1, 200); -+ gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0); -+ gtk_widget_show(sw); -+ -+ vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); -+ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw), vbox); -+ - label = gtk_label_new( - _("Please enter the screen name of the person you would like " - "to add to your buddy list. You may optionally enter an alias, " -@@ -4374,6 +4426,7 @@ - gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0); - gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); -+ pri_label = label; - - hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); - gtk_container_add(GTK_CONTAINER(vbox), hbox); -@@ -4446,6 +4499,25 @@ - - if (group != NULL) - gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(data->combo)->entry), group); -+ -+ //Wait for the window to have recieved its "configure_event", -+ //which means it has been resized by the WM -+ while (gtk_events_pending ()) gtk_main_iteration (); -+ -+ //Get allocated size, and adjust widgets accordingly -+ int w, h, field_labels_w; -+ gtk_window_get_size(GTK_WINDOW(data->window), &w, &h); -+ field_labels_w = label->allocation.width + GAIM_HIG_BORDER*2; //The width of the largest field-label -+ -+ // Window_border Scrollbar (FFH) -+ w = w - GAIM_HIG_BORDER * 2 - GAIM_HIG_BORDER * 4; -+ gtk_widget_set_size_request(GTK_WIDGET(pri_label), w, -1); -+ //Set the size of the input fields -+ gtk_widget_set_size_request(GTK_WIDGET(data->entry), w-field_labels_w, -1); -+ gtk_widget_set_size_request(GTK_WIDGET(data->entry_for_alias), w-field_labels_w, -1); -+ gtk_widget_set_size_request(GTK_WIDGET(data->combo), w-field_labels_w, -1); -+ gtk_widget_set_size_request(GTK_WIDGET(data->account_box), w-field_labels_w, -1); -+ - } - - static void -@@ -4572,6 +4644,9 @@ - GHashTable *defaults = NULL; - struct proto_chat_entry *pce; - gboolean focus = TRUE; -+ GtkWidget *label; -+ GtkWidget *rowbox; -+ GtkWidget *input; - - g_return_if_fail(data->account != NULL); - -@@ -4596,10 +4671,6 @@ - - for (tmp = list; tmp; tmp = tmp->next) - { -- GtkWidget *label; -- GtkWidget *rowbox; -- GtkWidget *input; -- - pce = tmp->data; - - rowbox = gtk_hbox_new(FALSE, 5); -@@ -4657,6 +4728,15 @@ - addchat_set_sensitive_if_input_cb(NULL, data); - - gtk_widget_show_all(data->entries_box); -+ -+ GList* children; -+ children = GTK_BOX(data->entries_box)->children; -+ while (children) -+ { -+ //Let the prilabel handle the maxsize -+ gtk_widget_set_size_request(((GtkBoxChild*)(children->data))->widget, 0, -1); -+ children = children->next; -+ } - } - - static void -@@ -4759,6 +4839,19 @@ - vbox = GTK_DIALOG(data->window)->vbox; - #endif - -+ //Make a scrollview to accomodate it all -+ sw = gtk_scrolled_window_new(NULL, NULL); -+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), -+ GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); -+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), -+ GTK_SHADOW_NONE); -+ gtk_widget_set_size_request(sw, -1, 200); -+ gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0); -+ gtk_widget_show(sw); -+ -+ vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); -+ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw), vbox); -+ - label = gtk_label_new( - _("Please enter an alias, and the appropriate information " - "about the chat you would like to add to your buddy list.\n")); -@@ -4766,7 +4859,8 @@ - gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0); - gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); -- -+ pri_label = label; -+ - rowbox = gtk_hbox_new(FALSE, 5); - gtk_box_pack_start(GTK_BOX(vbox), rowbox, FALSE, FALSE, 0); - -@@ -4825,6 +4919,24 @@ - G_CALLBACK(add_chat_resp_cb), data); - - gtk_widget_show_all(data->window); -+ -+ //Wait for the window to have recieved its "configure_event", -+ //which means it has been resized by the WM -+ while (gtk_events_pending ()) gtk_main_iteration (); -+ -+ //Get allocated size, and adjust the label accordingly -+ int w, h; -+ gtk_window_get_size(GTK_WINDOW(data->window), &w, &h); -+ -+ // Window_border Scrollbar (FFH) -+ w = w - GAIM_HIG_BORDER * 2 - GAIM_HIG_BORDER * 4; -+ gtk_widget_set_size_request(GTK_WIDGET(pri_label), w, -1); -+ //Let the prilabel handle the maxsize -+ gtk_widget_set_size_request(GTK_WIDGET(data->account_menu), 0, -1); -+ gtk_widget_set_size_request(GTK_WIDGET(data->entries_box), 0, -1); -+ gtk_widget_set_size_request(GTK_WIDGET(data->alias_entry), 0, -1); -+ gtk_widget_set_size_request(GTK_WIDGET(data->group_combo), 0, -1); -+ - } - - static void -Index: gaim/src/gtkrequest.c -=================================================================== ---- gaim.orig/src/gtkrequest.c 2005-08-19 21:57:30.273074704 +0200 -+++ gaim/src/gtkrequest.c 2005-08-19 21:58:05.468724152 +0200 -@@ -650,6 +650,17 @@ - /* Show everything. */ - gtk_widget_show_all(dialog); - -+ //Wait for the window to have recieved its "configure_event", -+ //which means it has been resized by the WM -+ while (gtk_events_pending ()) gtk_main_iteration (); -+ -+ //Get allocated size, and adjust widgets accordingly -+ int w, h; -+ gtk_window_get_size(GTK_WINDOW(dialog), &w, &h); -+ -+ w = w - GAIM_HIG_BORDER * 2; -+ gtk_widget_set_size_request(GTK_WIDGET(label), w, -1); -+ - return data; - } - diff --git a/packages/gaim/files/04-saved-status-dialogs.patch b/packages/gaim/files/04-saved-status-dialogs.patch deleted file mode 100644 index 2cdf70c5c1..0000000000 --- a/packages/gaim/files/04-saved-status-dialogs.patch +++ /dev/null @@ -1,40 +0,0 @@ -Identiske underkataloger: src2/CVS og src/CVS -Identiske underkataloger: src2/.deps og src/.deps -Index: gaim/src/gtksavedstatuses.c -=================================================================== ---- gaim.orig/src/gtksavedstatuses.c 2005-08-13 07:54:33.000000000 +0200 -+++ gaim/src/gtksavedstatuses.c 2005-08-19 21:20:41.806812608 +0200 -@@ -417,6 +417,7 @@ - bbox = gtk_hbutton_box_new(); - gtk_box_set_spacing(GTK_BOX(bbox), GAIM_HIG_BOX_SPACE); - gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END); -+ gtk_button_box_set_child_size(GTK_BUTTON_BOX(bbox), 20, -1); //DEPRECATED FFH - gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, TRUE, 0); - gtk_widget_show(bbox); - -@@ -449,12 +450,13 @@ - G_CALLBACK(status_window_delete_cb), dialog); - - /* Close button */ -- button = gtk_button_new_from_stock(GTK_STOCK_CLOSE); -+ //We can do without the close button to save screen estate -+ /*button = gtk_button_new_from_stock(GTK_STOCK_CLOSE); - gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0); - gtk_widget_show(button); - - g_signal_connect(G_OBJECT(button), "clicked", -- G_CALLBACK(status_window_close_cb), dialog); -+ G_CALLBACK(status_window_close_cb), dialog);*/ - - gtk_widget_show(win); - } -@@ -790,7 +792,8 @@ - disclosure = gaim_disclosure_new(_("Use a different status for some accounts"), - _("Use a different status for some accounts")); - gtk_box_pack_start(GTK_BOX(vbox), disclosure, FALSE, FALSE, 0); -- gtk_widget_show(disclosure); -+ //For now, do without the custom messages - not implemented yet -+ //gtk_widget_show(disclosure); - - /* Setup the box that the disclosure will cover */ - dbox = gtk_vbox_new(FALSE, GAIM_HIG_CAT_SPACE); diff --git a/packages/gaim/files/05-statusbox-icon-size.patch b/packages/gaim/files/05-statusbox-icon-size.patch deleted file mode 100644 index e18f3b2bcb..0000000000 --- a/packages/gaim/files/05-statusbox-icon-size.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gaim.ori/src/gtkstatusbox.c 2005-09-04 20:42:29.000000000 +0200 -+++ gaim/src/gtkstatusbox.c 2005-09-05 08:44:13.000000000 +0200 -@@ -173,7 +173,7 @@ - - text_rend = gtk_cell_renderer_text_new(); - icon_rend = gtk_cell_renderer_pixbuf_new(); -- icon_size = gtk_icon_size_from_name(GAIM_ICON_SIZE_STATUS); -+ icon_size = GTK_ICON_SIZE_SMALL_TOOLBAR; - - status_box->imhtml_visible = FALSE; - status_box->error_pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), GAIM_STOCK_STATUS_OFFLINE, diff --git a/packages/gaim/files/06-account-dialogs.patch b/packages/gaim/files/06-account-dialogs.patch deleted file mode 100644 index 9d2cb9acb0..0000000000 --- a/packages/gaim/files/06-account-dialogs.patch +++ /dev/null @@ -1,219 +0,0 @@ -Index: gaim/src/gtkaccount.c -=================================================================== ---- gaim.orig/src/gtkaccount.c 2005-08-25 17:16:44.000000000 +0200 -+++ gaim/src/gtkaccount.c 2005-08-29 22:34:25.511003600 +0200 -@@ -857,7 +857,6 @@ - { - GtkWidget *frame; - GtkWidget *vbox; -- GtkWidget *vbox2; - GtkWidget *hbox; - GtkWidget *hbox2; - GtkWidget *button; -@@ -901,12 +900,8 @@ - gaim_set_accessible_label (dialog->icon_entry, label); - dialog->icon_path = NULL; - -- vbox2 = gtk_vbox_new(FALSE, 0); -- gtk_box_pack_start(GTK_BOX(hbox), vbox2, TRUE, TRUE, 0); -- gtk_widget_show(vbox2); -- - hbox2 = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); -- gtk_box_pack_start(GTK_BOX(vbox2), hbox2, FALSE, FALSE, GAIM_HIG_BORDER); -+ gtk_box_pack_start(GTK_BOX(vbox), hbox2, FALSE, FALSE, GAIM_HIG_BORDER); - gtk_widget_show(hbox2); - - button = gtk_button_new_from_stock(GTK_STOCK_OPEN); -@@ -1275,7 +1270,18 @@ - gtk_option_menu_get_menu(GTK_OPTION_MENU(dialog->proxy_dropdown)); - #endif - -- add_pref_box(dialog, vbox, _("Proxy _type:"), dialog->proxy_dropdown); -+ GtkWidget *label; -+ label = gtk_label_new_with_mnemonic(_("Proxy _type:")); -+ gtk_size_group_add_widget(dialog->sg, label); -+ gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); -+ gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); -+ gtk_widget_show(label); -+ -+ gtk_box_pack_start(GTK_BOX(vbox), dialog->proxy_dropdown, TRUE, TRUE, GAIM_HIG_BORDER); -+ gtk_widget_show(dialog->proxy_dropdown); -+ gaim_set_accessible_label (dialog->proxy_dropdown, label); -+ -+ //add_pref_box(dialog, vbox, _("Proxy _type:"), dialog->proxy_dropdown); - - /* Setup the second vbox, which may be hidden at times. */ - dialog->proxy_vbox = vbox2 = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); -@@ -1643,6 +1649,7 @@ - AccountPrefsDialog *dialog; - GtkWidget *win; - GtkWidget *main_vbox; -+ GtkWidget *sw; - GtkWidget *vbox; - GtkWidget *bbox; - GtkWidget *dbox; -@@ -1709,10 +1716,19 @@ - gtk_box_pack_start(GTK_BOX(main_vbox), notebook, FALSE, FALSE, 0); - - /* Setup the inner vbox */ -+ //With a scrollbox -+ sw = gtk_scrolled_window_new(NULL, NULL); -+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), -+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); -+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), -+ GTK_SHADOW_NONE); -+ gtk_widget_set_size_request(sw, -1, -1); -+ gtk_notebook_append_page(GTK_NOTEBOOK(notebook), sw, -+ gtk_label_new_with_mnemonic("_Basic")); -+ gtk_widget_show(sw); - dialog->top_vbox = vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); - gtk_container_set_border_width(GTK_CONTAINER(vbox), GAIM_HIG_BORDER); -- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox, -- gtk_label_new_with_mnemonic("_Basic")); -+ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw), vbox); - gtk_widget_show(vbox); - - /* Setup the top frames. */ -@@ -1720,10 +1736,20 @@ - add_user_options(dialog, vbox); - - /* Setup the page with 'Advanced'. */ -+ //With a scrollbox -+ sw = gtk_scrolled_window_new(NULL, NULL); -+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), -+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); -+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), -+ GTK_SHADOW_NONE); -+ gtk_widget_set_size_request(sw, -1, -1); -+ gtk_notebook_append_page(GTK_NOTEBOOK(notebook), sw, -+ gtk_label_new_with_mnemonic("_Advanced")); -+ gtk_widget_show(sw); - dialog->bottom_vbox = dbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); - gtk_container_set_border_width(GTK_CONTAINER(dbox), GAIM_HIG_BORDER); -- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), dbox, -- gtk_label_new_with_mnemonic("_Advanced")); -+ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw), dbox); -+ gtk_widget_show(dbox); - - /** Setup the bottom frames. */ - add_protocol_options(dialog, dbox); -@@ -1731,46 +1757,50 @@ - add_proxy_options(dialog, dbox); - - /* Setup the button box */ -- bbox = gtk_hbutton_box_new(); -+ //bbox = gtk_hbutton_box_new(); -+ //Replaced with a hbox, otherwise the Register-button doesn't fit (same size required) -+ bbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); - gtk_box_set_spacing(GTK_BOX(bbox), GAIM_HIG_BOX_SPACE); -- gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END); - gtk_box_pack_end(GTK_BOX(main_vbox), bbox, FALSE, TRUE, 0); - gtk_widget_show(bbox); - -- /* Register button */ -- button = gtk_button_new_with_label(_("Register")); -- gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0); -- gtk_widget_show(button); -- -- g_signal_connect(G_OBJECT(button), "clicked", -- G_CALLBACK(register_account_prefs_cb), dialog); -- -- dialog->register_button = button; -- -+ /* Save button */ -+ button = gtk_button_new_from_stock(GTK_STOCK_SAVE); -+ gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0); -+ - if (dialog->account == NULL) - gtk_widget_set_sensitive(button, FALSE); - -- if (!dialog->prpl_info || !dialog->prpl_info->register_user) -- gtk_widget_hide(button); -+ gtk_widget_show(button); -+ -+ dialog->ok_button = button; -+ -+ g_signal_connect(G_OBJECT(button), "clicked", -+ G_CALLBACK(ok_account_prefs_cb), dialog); - - /* Cancel button */ - button = gtk_button_new_from_stock(GTK_STOCK_CANCEL); -- gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0); -+ gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0); - gtk_widget_show(button); - - g_signal_connect(G_OBJECT(button), "clicked", - G_CALLBACK(cancel_account_prefs_cb), dialog); - -- /* Save button */ -- button = gtk_button_new_from_stock(GTK_STOCK_SAVE); -- gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0); -+ /* Register button */ -+ button = gtk_button_new_with_label(_("Register")); -+ gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0); -+ gtk_widget_show(button); -+ -+ g_signal_connect(G_OBJECT(button), "clicked", -+ G_CALLBACK(register_account_prefs_cb), dialog); -+ -+ dialog->register_button = button; - - if (dialog->account == NULL) - gtk_widget_set_sensitive(button, FALSE); - -- gtk_widget_show(button); -- -- dialog->ok_button = button; -+ if (!dialog->prpl_info || !dialog->prpl_info->register_user) -+ gtk_widget_hide(button); - - /* Set up DND */ - gtk_drag_dest_set(dialog->window, -@@ -1783,11 +1813,20 @@ - g_signal_connect(G_OBJECT(dialog->window), "drag_data_received", - G_CALLBACK(account_dnd_recv), dialog); - -- g_signal_connect(G_OBJECT(button), "clicked", -- G_CALLBACK(ok_account_prefs_cb), dialog); -- - /* Show the window. */ - gtk_widget_show(win); -+ -+ //Wait for the window to have recieved its "configure_event", -+ //which means it has been resized by the WM -+ while (gtk_events_pending ()) gtk_main_iteration (); -+ -+ //Get allocated size, and adjust widgets accordingly -+ int w, h; -+ gtk_window_get_size(GTK_WINDOW(win), &w, &h); -+ -+ w = w - GAIM_HIG_BORDER * 2; -+ gtk_widget_set_size_request(GTK_WIDGET(dialog->protocol_menu), w, -1); -+ - } - - /************************************************************************** -@@ -2389,6 +2428,7 @@ - bbox = gtk_hbutton_box_new(); - gtk_box_set_spacing(GTK_BOX(bbox), GAIM_HIG_BOX_SPACE); - gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END); -+ gtk_button_box_set_child_size(GTK_BUTTON_BOX(bbox), 20, -1); //DEPRECATED FFH - gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, TRUE, 0); - gtk_widget_show(bbox); - -@@ -2421,12 +2461,13 @@ - G_CALLBACK(ask_delete_account_cb), dialog); - - /* Close button */ -- button = gtk_button_new_from_stock(GTK_STOCK_CLOSE); -+ //We can do without the close button to save screen estate -+ /*button = gtk_button_new_from_stock(GTK_STOCK_CLOSE); - gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0); - gtk_widget_show(button); - - g_signal_connect(G_OBJECT(button), "clicked", -- G_CALLBACK(close_accounts_cb), dialog); -+ G_CALLBACK(close_accounts_cb), dialog);*/ - - /* Setup some gaim signal handlers. */ - gaim_signal_connect(gaim_connections_get_handle(), "signed-on", diff --git a/packages/gaim/files/07-roomlist-dialog.patch b/packages/gaim/files/07-roomlist-dialog.patch deleted file mode 100644 index 2806c78fd4..0000000000 --- a/packages/gaim/files/07-roomlist-dialog.patch +++ /dev/null @@ -1,67 +0,0 @@ -Index: gaim/src/gtkroomlist.c -=================================================================== ---- gaim.orig/src/gtkroomlist.c 2005-08-13 01:53:28.000000000 +0200 -+++ gaim/src/gtkroomlist.c 2005-08-19 21:37:26.225117816 +0200 -@@ -129,7 +129,9 @@ - gtk_container_add(GTK_CONTAINER(dialog->sw), rl->tree); - - gtk_widget_set_sensitive(dialog->stop_button, TRUE); -+ gtk_widget_show(dialog->stop_button); - gtk_widget_set_sensitive(dialog->list_button, FALSE); -+ gtk_widget_hide(dialog->list_button); - gtk_widget_set_sensitive(dialog->join_button, FALSE); - } - -@@ -141,7 +143,9 @@ - gtk_widget_set_sensitive(dialog->account_widget, TRUE); - - gtk_widget_set_sensitive(dialog->stop_button, FALSE); -+ gtk_widget_hide(dialog->stop_button); - gtk_widget_set_sensitive(dialog->list_button, TRUE); -+ gtk_widget_show(dialog->list_button); - gtk_widget_set_sensitive(dialog->join_button, FALSE); - } - -@@ -396,7 +400,7 @@ - g_signal_connect(G_OBJECT(dialog->stop_button), "clicked", - G_CALLBACK(stop_button_cb), dialog); - gtk_widget_set_sensitive(dialog->stop_button, FALSE); -- gtk_widget_show(dialog->stop_button); -+ //gtk_widget_show(dialog->stop_button); - - /* list button */ - dialog->list_button = gtk_button_new_with_mnemonic(_("_Get List")); -@@ -415,11 +419,12 @@ - gtk_widget_show(dialog->join_button); - - /* close button */ -- dialog->close_button = gtk_button_new_from_stock(GTK_STOCK_CLOSE); -+ //We can do without the close button to save screen estate -+ /*dialog->close_button = gtk_button_new_from_stock(GTK_STOCK_CLOSE); - gtk_box_pack_start(GTK_BOX(bbox), dialog->close_button, FALSE, FALSE, 0); - g_signal_connect(G_OBJECT(dialog->close_button), "clicked", - G_CALLBACK(close_button_cb), dialog); -- gtk_widget_show(dialog->close_button); -+ gtk_widget_show(dialog->close_button);*/ - - /* show the dialog window and return the dialog */ - gtk_widget_show(dialog->window); -@@ -683,14 +688,18 @@ - if (rl->dialog->account_widget) - gtk_widget_set_sensitive(rl->dialog->account_widget, FALSE); - gtk_widget_set_sensitive(rl->dialog->stop_button, TRUE); -+ gtk_widget_show(rl->dialog->stop_button); - gtk_widget_set_sensitive(rl->dialog->list_button, FALSE); -+ gtk_widget_hide(rl->dialog->list_button); - } else { - rl->dialog->pg_needs_pulse = FALSE; - gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(rl->dialog->progress), 0.0); - if (rl->dialog->account_widget) - gtk_widget_set_sensitive(rl->dialog->account_widget, TRUE); - gtk_widget_set_sensitive(rl->dialog->stop_button, FALSE); -+ gtk_widget_hide(rl->dialog->stop_button); - gtk_widget_set_sensitive(rl->dialog->list_button, TRUE); -+ gtk_widget_show(rl->dialog->list_button); - } - } - diff --git a/packages/gaim/files/08-prefs-dialog.patch b/packages/gaim/files/08-prefs-dialog.patch deleted file mode 100644 index a8fcb89311..0000000000 --- a/packages/gaim/files/08-prefs-dialog.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- gaim.ori/src/gtkprefs.c 2005-09-05 08:28:17.000000000 +0200 -+++ gaim/src/gtkprefs.c 2005-09-05 09:06:27.000000000 +0200 -@@ -2108,12 +2108,18 @@ - if (icon) - g_object_unref(icon); - --#if GTK_CHECK_VERSION(2,4,0) -- return gtk_notebook_append_page(GTK_NOTEBOOK(prefsnotebook), page, gtk_label_new(text)); --#else -- gtk_notebook_append_page(GTK_NOTEBOOK(prefsnotebook), page, gtk_label_new(text)); -- return gtk_notebook_page_num(GTK_NOTEBOOK(prefsnotebook), page); --#endif -+ //Add a scrolled window around the page contents -+ GtkWidget *sw; -+ sw = gtk_scrolled_window_new(NULL, NULL); -+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), -+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); -+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), -+ GTK_SHADOW_NONE); -+ //gtk_widget_set_size_request(sw, -1, 200); -+ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw), page); -+ -+ -+ return gtk_notebook_append_page(GTK_NOTEBOOK(prefsnotebook), sw, gtk_label_new(text)); - } - - static void prefs_notebook_init() { -@@ -2146,9 +2152,9 @@ - void gaim_gtk_prefs_show(void) - { - GtkWidget *vbox; -- GtkWidget *bbox; -+ //GtkWidget *bbox; - GtkWidget *notebook; -- GtkWidget *button; -+ //GtkWidget *button; - - if (prefs) { - gtk_window_present(GTK_WINDOW(prefs)); -@@ -2176,11 +2182,13 @@ - - /* The notebook */ - prefsnotebook = notebook = gtk_notebook_new (); -- gtk_box_pack_start (GTK_BOX (vbox), notebook, FALSE, FALSE, 0); -+ gtk_notebook_set_scrollable(GTK_NOTEBOOK(prefsnotebook), TRUE); -+ gtk_box_pack_start (GTK_BOX (vbox), notebook, TRUE, TRUE, 0); - - - /* The buttons to press! */ -- bbox = gtk_hbutton_box_new(); -+ //To save screen estate we will do without a close button -+ /*bbox = gtk_hbutton_box_new(); - gtk_box_set_spacing(GTK_BOX(bbox), GAIM_HIG_BOX_SPACE); - gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END); - gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0); -@@ -2190,7 +2198,7 @@ - g_signal_connect_swapped(G_OBJECT(button), "clicked", - G_CALLBACK(gtk_widget_destroy), prefs); - gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0); -- gtk_widget_show(button); -+ gtk_widget_show(button);*/ - - prefs_notebook_init(); - diff --git a/packages/gaim/files/09-filetransfer-dialog.patch b/packages/gaim/files/09-filetransfer-dialog.patch deleted file mode 100644 index c4fa3a0a6d..0000000000 --- a/packages/gaim/files/09-filetransfer-dialog.patch +++ /dev/null @@ -1,52 +0,0 @@ -Index: gaim/src/gtkft.c -=================================================================== ---- gaim.orig/src/gtkft.c 2005-08-21 01:59:50.000000000 +0200 -+++ gaim/src/gtkft.c 2005-08-29 23:05:02.000000000 +0200 -@@ -772,24 +772,26 @@ - G_CALLBACK(open_button_cb), dialog); - - /* Pause button */ -- button = gtk_button_new_with_mnemonic(_("_Pause")); -+ /* Pause button has no function*/ -+ /*button = gtk_button_new_with_mnemonic(_("_Pause")); - gtk_widget_set_sensitive(button, FALSE); - gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0); - gtk_widget_show(button); - dialog->pause_button = button; - - g_signal_connect(G_OBJECT(button), "clicked", -- G_CALLBACK(pause_button_cb), dialog); -+ G_CALLBACK(pause_button_cb), dialog);*/ - - /* Resume button */ -- button = gtk_button_new_with_mnemonic(_("_Resume")); -+ /* Resume button has no function */ -+ /*button = gtk_button_new_with_mnemonic(_("_Resume")); - gtk_widget_set_sensitive(button, FALSE); - gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0); - gtk_widget_show(button); - dialog->resume_button = button; - - g_signal_connect(G_OBJECT(button), "clicked", -- G_CALLBACK(resume_button_cb), dialog); -+ G_CALLBACK(resume_button_cb), dialog);*/ - - /* Remove button */ - button = gtk_button_new_from_stock(GTK_STOCK_REMOVE); -@@ -811,13 +813,14 @@ - G_CALLBACK(stop_button_cb), dialog); - - /* Close button */ -- button = gtk_button_new_from_stock(GTK_STOCK_CLOSE); -+ /* Do without a close button to save screen estate */ -+ /*button = gtk_button_new_from_stock(GTK_STOCK_CLOSE); - gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0); - gtk_widget_show(button); - dialog->close_button = button; - - g_signal_connect(G_OBJECT(button), "clicked", -- G_CALLBACK(close_button_cb), dialog); -+ G_CALLBACK(close_button_cb), dialog);*/ - - return dialog; - } diff --git a/packages/gaim/files/10-pda-default-settings.patch b/packages/gaim/files/10-pda-default-settings.patch deleted file mode 100644 index 953dc11612..0000000000 --- a/packages/gaim/files/10-pda-default-settings.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: gaim/src/gtkconv.c -=================================================================== ---- gaim.orig/src/gtkconv.c 2005-08-25 17:16:50.000000000 +0200 -+++ gaim/src/gtkconv.c 2005-08-29 23:56:48.142463528 +0200 -@@ -6126,7 +6126,7 @@ - gaim_prefs_add_bool("/gaim/gtk/conversations/spellcheck", TRUE); - gaim_prefs_add_bool("/gaim/gtk/conversations/show_incoming_formatting", TRUE); - -- gaim_prefs_add_bool("/gaim/gtk/conversations/show_formatting_toolbar", TRUE); -+ gaim_prefs_add_bool("/gaim/gtk/conversations/show_formatting_toolbar", FALSE); - gaim_prefs_add_bool("/gaim/gtk/conversations/passthrough_unknown_commands", FALSE); - - gaim_prefs_add_string("/gaim/gtk/conversations/placement", "last"); diff --git a/packages/gaim/files/define-pda-mode.patch b/packages/gaim/files/define-pda-mode.patch deleted file mode 100644 index f1a368bc73..0000000000 --- a/packages/gaim/files/define-pda-mode.patch +++ /dev/null @@ -1,36 +0,0 @@ -Index: gaim/src/gtkgaim.h -=================================================================== ---- gaim.orig/src/gtkgaim.h 2005-08-25 17:29:42.000000000 +0200 -+++ gaim/src/gtkgaim.h 2005-08-25 19:00:37.335318168 +0200 -@@ -57,14 +57,14 @@ - * Spacings between components, as defined by the - * Gnome Human Interface Guidelines. - */ --#define GAIM_HIG_CAT_SPACE 18 --#define GAIM_HIG_BORDER 12 --#define GAIM_HIG_BOX_SPACE 6 -+#define GAIM_HIG_CAT_SPACE 9 -+#define GAIM_HIG_BORDER 6 -+#define GAIM_HIG_BOX_SPACE 3 - - /** - * Do we want icons in dialogs? - */ --#define ICONS_IN_DIALOGS 1 -+#define ICONS_IN_DIALOGS 0 - - /** - * How many fields is there screen-space for vertically, before a scrollbar is needed? -Index: gaim/src/gtkutils.c -=================================================================== ---- gaim.orig/src/gtkutils.c 2005-08-25 19:01:19.630888264 +0200 -+++ gaim/src/gtkutils.c 2005-08-25 19:02:05.067980776 +0200 -@@ -398,7 +398,7 @@ - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); - gtk_widget_show(hbox); - -- label = gtk_label_new(" "); -+ label = gtk_label_new(" "); - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); - gtk_widget_show(label); - diff --git a/packages/gaim/files/desktop-name-2.0.0.patch b/packages/gaim/files/desktop-name-2.0.0.patch deleted file mode 100644 index c921619721..0000000000 --- a/packages/gaim/files/desktop-name-2.0.0.patch +++ /dev/null @@ -1,27 +0,0 @@ -Index: gaim/gaim.desktop -=================================================================== ---- gaim.orig/gaim.desktop 2005-06-06 03:40:46.000000000 +0200 -+++ gaim/gaim.desktop 2005-08-21 02:00:18.525853592 +0200 -@@ -33,21 +33,7 @@ - GenericName[sq]=Lajmësjellës Internet - GenericName[sv]=Meddelandeklient - GenericName[zh_CN]=互联网通讯程序 --Name=Gaim Internet Messenger --Name[da]=Gaim - internet beskeder --Name[de]=Gaim Internet Messenger --Name[fr]=Gaim Messagerie Instantanée --Name[hu]=Gaim IM --Name[it]=Gaim Internet Messenger --Name[ko]=게임 메신저 --Name[nb]=Gaim lynmeldingsklient --Name[nl]=Gaim - Expresberichten --Name[pl]=Komunikator Internetowy Gaim --Name[pt]=Mensageiro Internet Gaim --Name[sl]=Gaim - spletni sel --Name[sq]=Lajmësjellësi Internet Gaim --Name[sv]=Gaim Internet Messenger --Name[zh_CN]=Gaim 互联网通讯程序 -+Name=Gaim - Exec=gaim - Icon=gaim.png - StartupNotify=true diff --git a/packages/gaim/files/desktop-name.patch b/packages/gaim/files/desktop-name.patch deleted file mode 100644 index 6095a77e47..0000000000 --- a/packages/gaim/files/desktop-name.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gaim-1.0.3/gaim.desktop.old 2005-01-01 16:48:58.000000000 +0000 -+++ gaim-1.0.3/gaim.desktop 2005-01-01 16:49:15.000000000 +0000 -@@ -1,6 +1,6 @@ - [Desktop Entry] - Encoding=UTF-8 --Name=Gaim Internet Messenger -+Name=Gaim - Name[de]=Gaim Internet Messenger - Name[da]=Gaim - internet beskeder - Name[fr]=Gaim Messagerie Instantanée diff --git a/packages/gaim/files/desktop-name_1.4.0.patch b/packages/gaim/files/desktop-name_1.4.0.patch deleted file mode 100644 index 3cfaa5771e..0000000000 --- a/packages/gaim/files/desktop-name_1.4.0.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gaim-1.4.0/gaim.desktop.old 2005-07-15 00:58:50.000000000 +0200 -+++ gaim-1.4.0/gaim.desktop 2005-07-15 00:59:35.000000000 +0200 -@@ -7,7 +7,7 @@ - Terminal=false - Type=Application - --Name=Gaim Internet Messenger -+Name=Gaim - Name[ca]=Missatger d'Internet Gaim - Name[cs]=Gaim Internet Messenger - Name[da]=Gaim - internet beskeder diff --git a/packages/gaim/files/desktop-name_1.5.0.patch b/packages/gaim/files/desktop-name_1.5.0.patch deleted file mode 100644 index 3cfaa5771e..0000000000 --- a/packages/gaim/files/desktop-name_1.5.0.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gaim-1.4.0/gaim.desktop.old 2005-07-15 00:58:50.000000000 +0200 -+++ gaim-1.4.0/gaim.desktop 2005-07-15 00:59:35.000000000 +0200 -@@ -7,7 +7,7 @@ - Terminal=false - Type=Application - --Name=Gaim Internet Messenger -+Name=Gaim - Name[ca]=Missatger d'Internet Gaim - Name[cs]=Gaim Internet Messenger - Name[da]=Gaim - internet beskeder diff --git a/packages/gaim/files/docklet-icon-size.patch b/packages/gaim/files/docklet-icon-size.patch deleted file mode 100644 index 6b8047a30c..0000000000 --- a/packages/gaim/files/docklet-icon-size.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: gaim/plugins/docklet/docklet-x11.c -=================================================================== ---- gaim.orig/plugins/docklet/docklet-x11.c 2005-04-02 17:23:28.000000000 +0200 -+++ gaim/plugins/docklet/docklet-x11.c 2005-08-21 02:06:51.869056336 +0200 -@@ -112,7 +112,7 @@ - break; - } - -- gtk_image_set_from_stock(GTK_IMAGE(image), icon_name, GTK_ICON_SIZE_LARGE_TOOLBAR); -+ gtk_image_set_from_stock(GTK_IMAGE(image), icon_name, GTK_ICON_SIZE_SMALL_TOOLBAR); - - #if 0 - GdkPixbuf *p; diff --git a/packages/gaim/files/gaim-OE-branding.patch b/packages/gaim/files/gaim-OE-branding.patch deleted file mode 100644 index d090899cac..0000000000 --- a/packages/gaim/files/gaim-OE-branding.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- /tmp/irc.h 2005-10-04 14:10:59.699874560 +0200 -+++ gaim/src/protocols/irc/irc.h 2005-10-04 14:13:10.135045400 +0200 -@@ -35,7 +35,7 @@ - #define IRC_DEFAULT_CHARSET "UTF-8" - #define IRC_DEFAULT_ALIAS "gaim" - --#define IRC_DEFAULT_QUIT "Download Gaim: " GAIM_WEBSITE -+#define IRC_DEFAULT_QUIT "Powered by OE: www.openembedded.org" - - #define IRC_INITIAL_BUFSIZE 1024 - diff --git a/packages/gaim/files/gevolution-eds-dbus.patch b/packages/gaim/files/gevolution-eds-dbus.patch deleted file mode 100644 index 0b7479d4f7..0000000000 --- a/packages/gaim/files/gevolution-eds-dbus.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- gaim/plugins/gevolution/gevolution.c.orig 2006-02-23 23:30:25.000000000 +0100 -+++ gaim/plugins/gevolution/gevolution.c 2006-02-23 23:31:42.000000000 +0100 -@@ -38,17 +38,12 @@ - --#include - --#include --#include --#include -+#include -+#include - - #include - - #define GEVOLUTION_PLUGIN_ID "gtk-x11-gevolution" - --#define E_DATA_BOOK_FACTORY_OAF_ID \ -- "OAFIID:GNOME_Evolution_DataServer_BookFactory" -- - enum - { - COLUMN_AUTOADD, -@@ -324,8 +320,6 @@ - static gboolean - plugin_load(GaimPlugin *plugin) - { -- bonobo_activate(); -- - backup_blist_ui_ops = gaim_blist_get_ui_ops(); - - blist_ui_ops = g_memdup(backup_blist_ui_ops, sizeof(GaimBlistUiOps)); -@@ -370,7 +364,6 @@ - static void - plugin_destroy(GaimPlugin *plugin) - { -- bonobo_debug_shutdown(); - } - - static void -@@ -563,13 +556,6 @@ - * So, in conclusion, this is an evil hack, but it doesn't harm anything - * and it works. - */ -- g_module_make_resident(plugin->handle); -- -- if (!bonobo_init_full(NULL, NULL, bonobo_activation_orb_get(), -- CORBA_OBJECT_NIL, CORBA_OBJECT_NIL)) -- { -- gaim_debug_error("evolution", "Unable to initialize bonobo.\n"); -- } - } - - GAIM_INIT_PLUGIN(gevolution, init_plugin, info) diff --git a/packages/gaim/files/gtk-deprecated-2.0.0.patch b/packages/gaim/files/gtk-deprecated-2.0.0.patch deleted file mode 100644 index 04bb9244f0..0000000000 --- a/packages/gaim/files/gtk-deprecated-2.0.0.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- gaim/configure.ac.orig 2005-12-19 23:04:14 +0100 -+++ gaim/configure.ac 2005-12-19 23:04:49 +0100 -@@ -442,10 +442,6 @@ - fi - fi - --if test "x$enable_deprecated" = "xno"; then -- DEBUG_CFLAGS="$DEBUG_CFLAGS -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED" --fi -- - if test "x$GCC" = "xyes"; then - DEBUG_CFLAGS="-Wall $DEBUG_CFLAGS" - CFLAGS="-g $CFLAGS" diff --git a/packages/gaim/files/no-superimposed-version-on-logo.patch b/packages/gaim/files/no-superimposed-version-on-logo.patch deleted file mode 100644 index 86809dfe98..0000000000 --- a/packages/gaim/files/no-superimposed-version-on-logo.patch +++ /dev/null @@ -1,19 +0,0 @@ -Index: gaim/src/gtkstock.c -=================================================================== ---- gaim.orig/src/gtkstock.c 2005-08-15 08:52:45.000000000 +0200 -+++ gaim/src/gtkstock.c 2005-08-19 18:13:26.550881552 +0200 -@@ -214,12 +214,12 @@ - - pixbuf = gdk_pixbuf_new_from_file(filename, NULL); - - g_free(filename); - -- if (!strcmp(stock_icons[i].name, GAIM_STOCK_LOGO)) -- gaim_gtk_stock_versionize(&pixbuf, win); -+ /*if (!strcmp(stock_icons[i].name, GAIM_STOCK_LOGO)) -+ gaim_gtk_stock_versionize(&pixbuf, win);*/ - - iconset = gtk_icon_set_new_from_pixbuf(pixbuf); - - g_object_unref(G_OBJECT(pixbuf)); - } diff --git a/packages/gaim/files/purple-OE-branding.patch b/packages/gaim/files/purple-OE-branding.patch deleted file mode 100644 index 99c61375ce..0000000000 --- a/packages/gaim/files/purple-OE-branding.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- /tmp/irc.h 2007-08-04 20:27:10.000000000 +0200 -+++ pidgin-2.1.0/libpurple/protocols/irc/irc.h 2007-08-04 20:28:15.318400000 +0200 -@@ -35,9 +35,9 @@ - #define IRC_DEFAULT_SSL_PORT 994 - - #define IRC_DEFAULT_CHARSET "UTF-8" --#define IRC_DEFAULT_ALIAS "purple" -+#define IRC_DEFAULT_ALIAS "OE-user" - --#define IRC_DEFAULT_QUIT "Leaving." -+#define IRC_DEFAULT_QUIT "Powered by OE: www.openembedded.org" - - #define IRC_INITIAL_BUFSIZE 1024 - diff --git a/packages/gaim/files/series b/packages/gaim/files/series deleted file mode 100644 index c7a16f71c1..0000000000 --- a/packages/gaim/files/series +++ /dev/null @@ -1,14 +0,0 @@ -no-superimposed-version-on-logo.patch -01-optional-icons-in-dialogs.patch -02-request-field-dialogs.patch -03-blist-dialogs.patch -04-saved-status-dialogs.patch -05-statusbox-icon-size.patch -06-account-dialogs.patch -07-roomlist-dialog.patch -define-pda-mode.patch -desktop-name-2.0.0.patch -docklet-icon-size.patch -08-prefs-dialog.patch -09-filetransfer-dialog.patch -10-pda-default-settings.patch diff --git a/packages/gaim/gaim.inc b/packages/gaim/gaim.inc deleted file mode 100644 index d2fb38881a..0000000000 --- a/packages/gaim/gaim.inc +++ /dev/null @@ -1,35 +0,0 @@ -SECTION = "x11/network" -DESCRIPTION = "multi-protocol instant messaging client" -LICENSE = "GPL" - -DEPENDS = "gtk+ gnutls virtual/libintl" -RRECOMMENDS_${PN} = "gaim-protocol-irc gaim-protocol-jabber gaim-plugin-docklet" - -EXTRA_OECONF = "--disable-audio --disable-perl --disable-tcl --disable-deprecated" - -FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \ - ${sysconfdir} ${sharedstatedir} ${localstatedir} \ - /bin /sbin /lib/*.so* ${datadir}/${PN} ${libdir}/${PN}/*.so \ - ${datadir}/pixmaps ${datadir}/applications \ - ${datadir}/idl ${datadir}/omf ${datadir}/sounds \ - ${libdir}/bonobo/servers" -FILES_${PN}-dev += "${libdir}/gaim/*.la" - -inherit autotools gettext - -PACKAGES_DYNAMIC = "gaim-protocol-* gaim-plugin-*" - -python populate_packages_prepend () { - root = bb.data.expand('${libdir}/gaim', d) - - do_split_packages(d, root, '^([^l][^i][^b].*)\.so$', - output_pattern='gaim-plugin-%s', - description='GAIM plugin %s', - prepend=True) - - do_split_packages(d, root, '^lib(.*)\.so$', - output_pattern='gaim-protocol-%s', - description='GAIM protocol plugin for %s', - prepend=True, - aux_files_pattern=['${datadir}/pixmaps/gaim/status/default/%s.png', '${datadir}/pixmaps/gaim/smileys/default/%s_*']) -} diff --git a/packages/gaim/gaim_1.0.3.bb b/packages/gaim/gaim_1.0.3.bb deleted file mode 100644 index f833ddde28..0000000000 --- a/packages/gaim/gaim_1.0.3.bb +++ /dev/null @@ -1,6 +0,0 @@ -PR = "r0" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \ - file://desktop-name.patch;patch=1" - -require gaim.inc diff --git a/packages/gaim/gaim_1.1.0.bb b/packages/gaim/gaim_1.1.0.bb deleted file mode 100644 index f833ddde28..0000000000 --- a/packages/gaim/gaim_1.1.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -PR = "r0" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \ - file://desktop-name.patch;patch=1" - -require gaim.inc diff --git a/packages/gaim/gaim_1.1.1.bb b/packages/gaim/gaim_1.1.1.bb deleted file mode 100644 index f833ddde28..0000000000 --- a/packages/gaim/gaim_1.1.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -PR = "r0" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \ - file://desktop-name.patch;patch=1" - -require gaim.inc diff --git a/packages/gaim/gaim_1.1.2.bb b/packages/gaim/gaim_1.1.2.bb deleted file mode 100644 index 3bf9aeb3a7..0000000000 --- a/packages/gaim/gaim_1.1.2.bb +++ /dev/null @@ -1,9 +0,0 @@ -PR = "r0" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \ - file://desktop-name.patch;patch=1" - -require gaim.inc - -CFLAGS += "-D_GNU_SOURCE" - diff --git a/packages/gaim/gaim_1.4.0.bb b/packages/gaim/gaim_1.4.0.bb deleted file mode 100644 index 1585229b14..0000000000 --- a/packages/gaim/gaim_1.4.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -PR = "r0" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \ - file://desktop-name_1.4.0.patch;patch=1" - -require gaim.inc - -CFLAGS += "-D_GNU_SOURCE" - diff --git a/packages/gaim/gaim_1.5.0.bb b/packages/gaim/gaim_1.5.0.bb deleted file mode 100644 index 3bf9aeb3a7..0000000000 --- a/packages/gaim/gaim_1.5.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -PR = "r0" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \ - file://desktop-name.patch;patch=1" - -require gaim.inc - -CFLAGS += "-D_GNU_SOURCE" - diff --git a/packages/gaim/gaim_2.0.0-cvs-mco1.bb b/packages/gaim/gaim_2.0.0-cvs-mco1.bb deleted file mode 100644 index bf8591920c..0000000000 --- a/packages/gaim/gaim_2.0.0-cvs-mco1.bb +++ /dev/null @@ -1,44 +0,0 @@ -PR = "r3" -SRCDATE_${PN} = "20050904" -#Change to x.y.z+cvs${SRCDATE}-mco1 when 2.0.0 changes -PV = "2.0.0-cvs-mco1-${SRCDATE}" - -DEFAULT_PREFERENCE = "-1" - -WEBCVSURL = "http://handhelds.org/cgi-bin/cvsweb.cgi/~checkout~/gaim" - -SRC_URI = "cvs://anonymous@gaim.cvs.sourceforge.net/cvsroot/gaim;module=gaim \ - ${WEBCVSURL}/no-superimposed-version-on-logo.patch;patch=1 \ - ${WEBCVSURL}/01-optional-icons-in-dialogs.patch;patch=1 \ - ${WEBCVSURL}/02-request-field-dialogs.patch;patch=1 \ - ${WEBCVSURL}/03-blist-dialogs.patch;patch=1 \ - ${WEBCVSURL}/04-saved-status-dialogs.patch;patch=1 \ - ${WEBCVSURL}/05-statusbox-icon-size.patch;patch=1 \ - ${WEBCVSURL}/06-account-dialogs.patch;patch=1 \ - ${WEBCVSURL}/07-roomlist-dialog.patch;patch=1 \ - ${WEBCVSURL}/define-pda-mode.patch;patch=1 \ - ${WEBCVSURL}/desktop-name-2.0.0.patch;patch=1 \ - ${WEBCVSURL}/docklet-icon-size.patch;patch=1 \ - ${WEBCVSURL}/08-prefs-dialog.patch;patch=1 \ - ${WEBCVSURL}/09-filetransfer-dialog.patch;patch=1 \ - ${WEBCVSURL}/10-pda-default-settings.patch;patch=1 \ - file://gaim-OE-branding.patch;patch=1 \ - " - -require gaim.inc - -S = "${WORKDIR}/gaim" - -CFLAGS += "-D_GNU_SOURCE" - - -DEPENDS += "startup-notification" - -#include autopoint (gettext) -EXTRA_AUTORECONF = "" - -#disable "X Session Management"... It is EVIL -EXTRA_OECONF += "--disable-sm --enable-startup-notification \ - --with-gnutls-includes=${STAGING_INCDIR}" - - diff --git a/packages/gaim/pidgin.inc b/packages/gaim/pidgin.inc deleted file mode 100644 index a2ef61a508..0000000000 --- a/packages/gaim/pidgin.inc +++ /dev/null @@ -1,85 +0,0 @@ -SECTION = "x11/network" -DESCRIPTION = "multi-protocol instant messaging client" -LICENSE = "GPL" - -DEPENDS = "avahi gtk+ ncurses gnutls virtual/libintl gstreamer dbus" -RRECOMMENDS_${PN} = "libpurple-plugin-ssl-gnutls libpurple-protocol-irc libpurple-protocol-xmpp" - -EXTRA_OECONF = " \ - --disable-audio \ - --disable-perl \ - --disable-tcl \ - --disable-deprecated \ - --disable-gevolution \ - --x-includes=${STAGING_INCDIR} \ - --x-libraries=${STAGING_LIBDIR} \ - --enable-gnutls=yes \ - --with-ncurses-headers=${STAGING_INCDIR} \ - --with-gnutls-includes=${STAGING_INCDIR} \ - --with-gnutls-libs=${STAGING_LIBDIR} \ - " - -OE_LT_RPATH_ALLOW=":${libdir}/purple-2:" -OE_LT_RPATH_ALLOW[export]="1" - -PACKAGES =+ "libpurple libpurple-dev libpurple-dbg libpurple-liboscar libpurple-libjabber libpurple-logreader finch finch-dev finch-dbg" - - -LEAD_SONAME = "libpurple.so.0" -FILES_libpurple = "${libdir}/libpurple*.so.* /usr/bin/purple-* /etc/gconf/schemas/purple*" -FILES_libpurple-dev = "${libdir}/libpurple* \ - ${libdir}/purple-2/*.la " -FILES_libpurple-dbg += "${libdir}/.debug/libpurple* \ - ${libdir}/purple-2/.debug" -FILES_libpurple-liboscar = "${libdir}/purple-2/liboscar.so.*" -FILES_libpurple-libjabber = "${libdir}/purple-2/libjabber.so.*" -FILES_libpurple-logreader = "${libdir}/purple-2/log_reader.so" -FILES_finch = "${bindir}/finch /usr/lib/libgnt.so.*" -FILES_finch-dev = "${libdir}/finch/*.la" -FILES_finch-dbg = "${bindir}/.debug/finch \ - ${libdir}/finch/.debug" - -FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \ - ${sysconfdir} ${sharedstatedir} ${localstatedir} \ - /bin /sbin /lib/*.so* ${datadir}/${PN} ${libdir}/${PN}/*.so \ - ${datadir}/pixmaps ${datadir}/applications \ - ${datadir}/idl ${datadir}/omf ${datadir}/sounds \ - ${libdir}/bonobo/servers ${datadir}/icons" -FILES_${PN}-dev += "${libdir}/pidgin/*.la" - -inherit autotools gettext pkgconfig gconf - -PACKAGES_DYNAMIC = "libpurple-protocol-* libpurple-plugin-* pidgin-plugin-* finch-plugin-*" - -python populate_packages_prepend () { - root = bb.data.expand('${libdir}/pidgin', d) - purple = bb.data.expand('${libdir}/purple-2', d) - finch = bb.data.expand('${libdir}/finch', d) - - do_split_packages(d, root, '^([^l][^i][^b].*)\.so$', - output_pattern='pidgin-plugin-%s', - description='Pidgin plugin %s', - prepend=True, extra_depends='') - - do_split_packages(d, purple, '^lib(.*)\.so$', - output_pattern='libpurple-protocol-%s', - description='Libpurple protocol plugin for %s', - prepend=True, extra_depends='') - - do_split_packages(d, purple, '^(ssl-.*)\.so$', - output_pattern='libpurple-plugin-%s', - description='libpurple plugin %s', - prepend=True, extra_depends='libpurple-plugin-ssl') - - do_split_packages(d, purple, '^([^l][^i][^b].*)\.so$', - output_pattern='libpurple-plugin-%s', - description='libpurple plugin %s', - prepend=True, extra_depends='') - - do_split_packages(d, finch, '^([^l][^i][^b].*)\.so$', - output_pattern='finch-plugin-%s', - description='Finch plugin %s', - prepend=True, extra_depends='') - - -} diff --git a/packages/gaim/pidgin/.mtn2git_empty b/packages/gaim/pidgin/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gaim/pidgin/gconf-no-errors.patch b/packages/gaim/pidgin/gconf-no-errors.patch deleted file mode 100644 index 9a95175ac9..0000000000 --- a/packages/gaim/pidgin/gconf-no-errors.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- /tmp/Makefile.am 2007-05-08 18:39:49.000000000 +0200 -+++ pidgin-2.0.0/libpurple/gconf/Makefile.am 2007-05-08 18:40:13.755251000 +0200 -@@ -8,8 +8,7 @@ - - if GCONF_SCHEMAS_INSTALL - install-data-local: -- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA) 2>&1 | \ -- grep -v "^WARNING: failed to install schema" | grep -v "^Attached schema" 1>&2 -+ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA) 2>&1 - else - install-data-local: - endif diff --git a/packages/gaim/pidgin/pidgin.desktop-set-icon.patch b/packages/gaim/pidgin/pidgin.desktop-set-icon.patch deleted file mode 100644 index 05f76895ba..0000000000 --- a/packages/gaim/pidgin/pidgin.desktop-set-icon.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- pidgin-2.0.1/pidgin.desktop.in.orig 2007-06-20 23:50:44.000000000 +0000 -+++ pidgin-2.0.1/pidgin.desktop.in 2007-06-20 23:51:05.000000000 +0000 -@@ -4,7 +4,7 @@ - _GenericName=Internet Messenger - _Comment=Send instant messages over multiple protocols - Exec=pidgin --Icon=pidgin -+Icon=/usr/share/icons/hicolor/48x48/apps/pidgin.png - StartupNotify=true - Terminal=false - Type=Application diff --git a/packages/gaim/pidgin/sanitize-configure.ac.patch b/packages/gaim/pidgin/sanitize-configure.ac.patch deleted file mode 100644 index a77d64f40b..0000000000 --- a/packages/gaim/pidgin/sanitize-configure.ac.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- /tmp/configure.ac 2007-05-08 17:29:02.000000000 +0200 -+++ pidgin-2.0.0/configure.ac 2007-05-08 17:30:30.325251000 +0200 -@@ -472,7 +472,7 @@ - if test "x$enable_consoleui" = "xyes"; then - dnl # Some distros put the headers in ncursesw/, some don't - found_ncurses_h=no -- for location in $ac_ncurses_includes $NCURSES_HEADERS /usr/include/ncursesw /usr/include -+ for location in $ac_ncurses_includes $NCURSES_HEADERS - do - f="$location/ncurses.h" - AC_CHECK_HEADER($f,[ -@@ -1860,10 +1860,6 @@ - KRB4_CFLAGS="$KRB4_CFLAGS -I${kerberos}/include/kerberosIV" - fi - KRB4_LDFLAGS="-L${kerberos}/lib" -- elif test -d /usr/local/include/kerberosIV ; then -- KRB4_CFLAGS="-I/usr/local/include/kerberosIV" -- elif test -d /usr/include/kerberosIV ; then -- KRB4_CFLAGS="-I/usr/include/kerberosIV" - fi - AC_DEFINE(ZEPHYR_USES_KERBEROS, 1, [Define if kerberos should be used in Zephyr.]) - -@@ -1896,10 +1892,6 @@ - ZEPHYR_LDFLAGS="-L${zephyr}/lib" - elif test -d /usr/athena/include/zephyr ; then - ZEPHYR_CFLAGS="-I/usr/athena/include" -- elif test -d /usr/include/zephyr ; then -- ZEPHYR_CFLAGS="-I/usr/include" -- elif test -d /usr/local/include/zephyr ; then -- ZEPHYR_CFLAGS="-I/usr/local/include" - fi - AC_DEFINE(LIBZEPHYR_EXT, 1 , [Define if external libzephyr should be used.]) - AM_CONDITIONAL(EXTERNAL_LIBZEPHYR, test "x$zephyr" != "xno") diff --git a/packages/gaim/pidgin_2.0.2.bb b/packages/gaim/pidgin_2.0.2.bb deleted file mode 100644 index 2cc02c5072..0000000000 --- a/packages/gaim/pidgin_2.0.2.bb +++ /dev/null @@ -1,9 +0,0 @@ -require pidgin.inc - -SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \ - file://sanitize-configure.ac.patch;patch=1 \ - file://gconf-no-errors.patch;patch=1 \ - file://pidgin.desktop-set-icon.patch;patch=1 \ - " - -PR = "r1" diff --git a/packages/gaim/pidgin_2.1.1.bb b/packages/gaim/pidgin_2.1.1.bb deleted file mode 100644 index 5531880669..0000000000 --- a/packages/gaim/pidgin_2.1.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -require pidgin.inc - -SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \ - file://sanitize-configure.ac.patch;patch=1 \ - file://gconf-no-errors.patch;patch=1 \ - file://pidgin.desktop-set-icon.patch;patch=1 \ - file://purple-OE-branding.patch;patch=1 \ - " - -PR = "r0" diff --git a/packages/gaim/pidgin_2.2.1.bb b/packages/gaim/pidgin_2.2.1.bb deleted file mode 100644 index 5531880669..0000000000 --- a/packages/gaim/pidgin_2.2.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -require pidgin.inc - -SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \ - file://sanitize-configure.ac.patch;patch=1 \ - file://gconf-no-errors.patch;patch=1 \ - file://pidgin.desktop-set-icon.patch;patch=1 \ - file://purple-OE-branding.patch;patch=1 \ - " - -PR = "r0" diff --git a/packages/obsolete/gaim/.mtn2git_empty b/packages/obsolete/gaim/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/obsolete/gaim/files/.mtn2git_empty b/packages/obsolete/gaim/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/obsolete/gaim/files/01-optional-icons-in-dialogs.patch b/packages/obsolete/gaim/files/01-optional-icons-in-dialogs.patch new file mode 100644 index 0000000000..260dcf364f --- /dev/null +++ b/packages/obsolete/gaim/files/01-optional-icons-in-dialogs.patch @@ -0,0 +1,514 @@ +Index: gaim/src/gtkblist.c +=================================================================== +--- gaim.orig/src/gtkblist.c 2005-08-19 23:23:45.000000000 +0200 ++++ gaim/src/gtkblist.c 2005-08-21 02:32:13.989658832 +0200 +@@ -873,16 +873,23 @@ + void + gaim_gtk_blist_joinchat_show(void) + { +- GtkWidget *hbox, *vbox; ++ GtkWidget *vbox; + GtkWidget *rowbox; + GtkWidget *label; ++ GtkWidget *pri_label; + GaimGtkBuddyList *gtkblist; ++ GtkWidget *sw; ++#if ICONS_IN_DIALOGS ++ GtkWidget *hbox; + GtkWidget *img = NULL; ++#endif + GaimGtkJoinChatData *data = NULL; + + gtkblist = GAIM_GTK_BLIST(gaim_get_blist()); ++#if ICONS_IN_DIALOGS + img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION, + GTK_ICON_SIZE_DIALOG); ++#endif + data = g_new0(GaimGtkJoinChatData, 1); + + data->window = gtk_dialog_new_with_buttons(_("Join a Chat"), +@@ -897,6 +904,7 @@ + GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), GAIM_HIG_BOX_SPACE); + gtk_window_set_role(GTK_WINDOW(data->window), "join_chat"); + ++#if ICONS_IN_DIALOGS + hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); + gtk_container_add(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), hbox); + gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); +@@ -905,6 +913,9 @@ + vbox = gtk_vbox_new(FALSE, 5); + gtk_container_set_border_width(GTK_CONTAINER(vbox), 0); + gtk_container_add(GTK_CONTAINER(hbox), vbox); ++#else ++ vbox = GTK_DIALOG(data->window)->vbox; ++#endif + + label = gtk_label_new(_("Please enter the appropriate information " + "about the chat you would like to join.\n")); +@@ -4304,9 +4315,13 @@ + { + GtkWidget *table; + GtkWidget *label; ++ GtkWidget *pri_label; + GtkWidget *hbox; + GtkWidget *vbox; ++ GtkWidget *sw; ++#if ICONS_IN_DIALOGS + GtkWidget *img; ++#endif + GaimGtkBuddyList *gtkblist; + GaimGtkAddBuddyData *data = g_new0(GaimGtkAddBuddyData, 1); + +@@ -4315,8 +4330,10 @@ + ? account + : gaim_connection_get_account(gaim_connections_get_all()->data)); + ++#if ICONS_IN_DIALOGS + img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION, + GTK_ICON_SIZE_DIALOG); ++#endif + + gtkblist = GAIM_GTK_BLIST(gaim_get_blist()); + +@@ -4335,6 +4352,7 @@ + gtk_window_set_type_hint(GTK_WINDOW(data->window), + GDK_WINDOW_TYPE_HINT_DIALOG); + ++#if ICONS_IN_DIALOGS + hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); + gtk_container_add(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), hbox); + gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); +@@ -4342,6 +4360,9 @@ + + vbox = gtk_vbox_new(FALSE, 0); + gtk_container_add(GTK_CONTAINER(hbox), vbox); ++#else ++ vbox = GTK_DIALOG(data->window)->vbox; ++#endif + + label = gtk_label_new( + _("Please enter the screen name of the person you would like " +@@ -4663,10 +4684,14 @@ + GList *l; + GaimConnection *gc; + GtkWidget *label; ++ GtkWidget *pri_label; + GtkWidget *rowbox; +- GtkWidget *hbox; + GtkWidget *vbox; ++ GtkWidget *sw; ++#if ICONS_IN_DIALOGS ++ GtkWidget *hbox; + GtkWidget *img; ++#endif + + if (account != NULL) { + gc = gaim_account_get_connection(account); +@@ -4698,8 +4723,10 @@ + data->account = account; + data->default_chat_name = g_strdup(name); + ++#if ICONS_IN_DIALOGS + img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION, + GTK_ICON_SIZE_DIALOG); ++#endif + + gtkblist = GAIM_GTK_BLIST(gaim_get_blist()); + +@@ -4720,6 +4747,7 @@ + gtk_window_set_type_hint(GTK_WINDOW(data->window), + GDK_WINDOW_TYPE_HINT_DIALOG); + ++#if ICONS_IN_DIALOGS + hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); + gtk_container_add(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), hbox); + gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); +@@ -4727,6 +4755,9 @@ + + vbox = gtk_vbox_new(FALSE, 5); + gtk_container_add(GTK_CONTAINER(hbox), vbox); ++#else ++ vbox = GTK_DIALOG(data->window)->vbox; ++#endif + + label = gtk_label_new( + _("Please enter an alias, and the appropriate information " +Index: gaim/src/gtkconn.c +=================================================================== +--- gaim.orig/src/gtkconn.c 2005-08-19 23:23:45.000000000 +0200 ++++ gaim/src/gtkconn.c 2005-08-19 23:27:18.000000000 +0200 +@@ -371,7 +371,10 @@ + + /* Build the window if it isn't there yet */ + if (!disconnect_window) { +- GtkWidget *hbox, *vbox, *img; ++ GtkWidget *hbox, *vbox; ++ #if ICONS_IN_DIALOGS ++ GtkWidget *img; ++ #endif + GtkCellRenderer *rend, *rend2; + + disconnect_window = g_new0(struct disconnect_window, 1); +@@ -384,6 +387,7 @@ + gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(disconnect_window->window)->vbox), GAIM_HIG_BORDER); + gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(disconnect_window->window)->vbox), GAIM_HIG_BOX_SPACE); + ++#if ICONS_IN_DIALOGS + hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); + gtk_container_add(GTK_CONTAINER(GTK_DIALOG(disconnect_window->window)->vbox), hbox); + img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_ERROR, GTK_ICON_SIZE_DIALOG); +@@ -392,6 +396,9 @@ + + vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); + gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0); ++#else ++ vbox = GTK_DIALOG(disconnect_window->window)->vbox; ++#endif + + disconnect_window->label = gtk_label_new(label_text); + +Index: gaim/src/gtkconv.c +=================================================================== +--- gaim.orig/src/gtkconv.c 2005-08-19 23:23:45.000000000 +0200 ++++ gaim/src/gtkconv.c 2005-08-19 23:27:18.000000000 +0200 +@@ -847,10 +847,12 @@ + GtkWidget *label; + GtkWidget *vbox, *hbox; + GtkWidget *table; ++#if ICONS_IN_DIALOGS + GtkWidget *img; + + img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION, + GTK_ICON_SIZE_DIALOG); ++#endif + + info = g_new0(InviteBuddyInfo, 1); + info->conv = conv; +@@ -880,6 +882,7 @@ + gtk_box_set_spacing(GTK_BOX(vbox), GAIM_HIG_BORDER); + gtk_container_set_border_width(GTK_CONTAINER(vbox), GAIM_HIG_BOX_SPACE); + ++#if ICONS_IN_DIALOGS + /* Setup the inner hbox and put the dialog's icon in it. */ + hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); + gtk_container_add(GTK_CONTAINER(vbox), hbox); +@@ -889,6 +892,7 @@ + /* Setup the right vbox. */ + vbox = gtk_vbox_new(FALSE, 0); + gtk_container_add(GTK_CONTAINER(hbox), vbox); ++#endif + + /* Put our happy label in it. */ + label = gtk_label_new(_("Please enter the name of the user you wish " +@@ -1107,8 +1111,10 @@ + GaimGtkWindow *gtkwin = GAIM_GTK_WINDOW(win); + GaimGtkConversation *gtkconv = GAIM_GTK_CONVERSATION(conv); + GtkWidget *hbox; ++#if ICONS_IN_DIALOGS + GtkWidget *img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION, + GTK_ICON_SIZE_DIALOG); ++#endif + GtkWidget *label; + struct _search *s; + +@@ -1139,9 +1145,11 @@ + hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); + gtk_container_add(GTK_CONTAINER(GTK_DIALOG(gtkconv->dialogs.search)->vbox), + hbox); ++#if ICONS_IN_DIALOGS + gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); + + gtk_misc_set_alignment(GTK_MISC(img), 0, 0); ++#endif + gtk_dialog_set_response_sensitive(GTK_DIALOG(gtkconv->dialogs.search), + GTK_RESPONSE_OK, FALSE); + +Index: gaim/src/gtkdebug.c +=================================================================== +--- gaim.orig/src/gtkdebug.c 2005-08-19 23:23:45.000000000 +0200 ++++ gaim/src/gtkdebug.c 2005-08-19 23:27:18.000000000 +0200 +@@ -149,7 +149,10 @@ + static void + find_cb(GtkWidget *w, DebugWindow *win) + { +- GtkWidget *hbox, *img, *label; ++ GtkWidget *hbox, *label; ++#if ICONS_IN_DIALOGS ++ GtkWidget *img; ++#endif + struct _find *f; + + if(win->find) +@@ -179,11 +182,13 @@ + hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); + gtk_container_add(GTK_CONTAINER(GTK_DIALOG(win->find)->vbox), + hbox); ++#if ICONS_IN_DIALOGS + img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION, + GTK_ICON_SIZE_DIALOG); + gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); + + gtk_misc_set_alignment(GTK_MISC(img), 0, 0); ++#endif + gtk_dialog_set_response_sensitive(GTK_DIALOG(win->find), + GTK_RESPONSE_OK, FALSE); + +Index: gaim/src/gtkdialogs.c +=================================================================== +--- gaim.orig/src/gtkdialogs.c 2005-08-19 23:23:45.000000000 +0200 ++++ gaim/src/gtkdialogs.c 2005-08-19 23:27:18.000000000 +0200 +@@ -534,7 +534,9 @@ + GtkWidget *window; + GtkWidget *hbox; + GtkWidget *label; ++#if ICONS_IN_DIALOGS + GtkWidget *img; ++#endif + gchar *norm = gaim_strreplace(ee, "rocksmyworld", ""); + + label = gtk_label_new(NULL); +@@ -582,8 +584,10 @@ + + hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); + gtk_container_add(GTK_CONTAINER(GTK_DIALOG(window)->vbox), hbox); ++#if ICONS_IN_DIALOGS + img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_COOL, gtk_icon_size_from_name(GAIM_ICON_SIZE_DIALOG_COOL)); + gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); ++#endif + + gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0); +Index: gaim/src/gtkgaim.h +=================================================================== +--- gaim.orig/src/gtkgaim.h 2005-08-19 23:26:29.000000000 +0200 ++++ gaim/src/gtkgaim.h 2005-08-21 02:32:29.270335816 +0200 +@@ -61,5 +61,10 @@ + #define GAIM_HIG_BORDER 12 + #define GAIM_HIG_BOX_SPACE 6 + ++/** ++ * Do we want icons in dialogs? ++ */ ++#define ICONS_IN_DIALOGS 1 ++ + #endif /* _GAIM_GTKGAIM_H_ */ + +Index: gaim/src/gtknotify.c +=================================================================== +--- gaim.orig/src/gtknotify.c 2005-08-19 23:23:45.000000000 +0200 ++++ gaim/src/gtknotify.c 2005-08-21 02:32:03.765213184 +0200 +@@ -125,7 +125,9 @@ + GtkWidget *dialog; + GtkWidget *hbox; + GtkWidget *label; ++#if ICONS_IN_DIALOGS + GtkWidget *img = NULL; ++#endif + char label_text[2048]; + const char *icon_name = NULL; + char *primary_esc, *secondary_esc; +@@ -149,11 +151,13 @@ + break; + } + ++#if ICONS_IN_DIALOGS + if (icon_name != NULL) + { + img = gtk_image_new_from_stock(icon_name, GTK_ICON_SIZE_DIALOG); + gtk_misc_set_alignment(GTK_MISC(img), 0, 0); + } ++#endif + + dialog = gtk_dialog_new_with_buttons(title ? title : GAIM_ALERT_TITLE, + NULL, 0, GTK_STOCK_CLOSE, +@@ -173,8 +177,10 @@ + hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); + gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); + ++#if ICONS_IN_DIALOGS + if (img != NULL) + gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); ++#endif + + primary_esc = g_markup_escape_text(primary, -1); + secondary_esc = (secondary != NULL) ? g_markup_escape_text(secondary, -1) : NULL; +@@ -218,9 +224,11 @@ + GaimNotifyMailData *data; + GtkWidget *dialog; + GtkWidget *vbox; +- GtkWidget *hbox; + GtkWidget *label; ++#if ICONS_IN_DIALOGS ++ GtkWidget *hbox; + GtkWidget *img; ++#endif + char *detail_text; + char *label_text; + +@@ -248,6 +256,7 @@ + gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE); + gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), GAIM_HIG_BORDER); + ++#if ICONS_IN_DIALOGS + /* Setup the main horizontal box */ + hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); + gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); +@@ -262,6 +271,9 @@ + vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); + + gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0); ++#else ++ vbox = GTK_DIALOG(dialog)->vbox; ++#endif + + /* Descriptive label */ + detail_text = g_strdup_printf(ngettext("%s has %d new message.", +Index: gaim/src/gtkrequest.c +=================================================================== +--- gaim.orig/src/gtkrequest.c 2005-08-19 23:23:45.000000000 +0200 ++++ gaim/src/gtkrequest.c 2005-08-21 02:32:15.943361824 +0200 +@@ -281,10 +281,12 @@ + GaimGtkRequestData *data; + GtkWidget *dialog; + GtkWidget *vbox; +- GtkWidget *hbox; + GtkWidget *label; + GtkWidget *entry; ++#if ICONS_IN_DIALOGS ++ GtkWidget *hbox; + GtkWidget *img; ++#endif + GtkWidget *toolbar; + char *label_text; + char *primary_esc, *secondary_esc; +@@ -318,6 +320,7 @@ + gtk_dialog_set_default_response(GTK_DIALOG(dialog), 0); + gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), GAIM_HIG_BORDER); + ++#if ICONS_IN_DIALOGS + /* Setup the main horizontal box */ + hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); + gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); +@@ -332,6 +335,9 @@ + vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); + + gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0); ++#else ++ vbox = GTK_DIALOG(dialog)->vbox; ++#endif + + /* Descriptive label */ + primary_esc = (primary != NULL) ? g_markup_escape_text(primary, -1) : NULL; +@@ -435,9 +441,11 @@ + GaimGtkRequestData *data; + GtkWidget *dialog; + GtkWidget *vbox, *vbox2; +- GtkWidget *hbox; + GtkWidget *label; ++#if ICONS_IN_DIALOGS ++ GtkWidget *hbox; + GtkWidget *img; ++#endif + GtkWidget *radio = NULL; + char *label_text; + char *radio_text; +@@ -475,6 +483,7 @@ + gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE); + gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), GAIM_HIG_BORDER); + ++#if ICONS_IN_DIALOGS + /* Setup the main horizontal box */ + hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); + gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); +@@ -488,6 +497,9 @@ + /* Vertical box */ + vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); + gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0); ++#else ++ vbox = GTK_DIALOG(dialog)->vbox; ++#endif + + /* Descriptive label */ + primary_esc = (primary != NULL) ? g_markup_escape_text(primary, -1) : NULL; +@@ -536,9 +548,11 @@ + GaimGtkRequestData *data; + GtkWidget *dialog; + GtkWidget *vbox; +- GtkWidget *hbox; + GtkWidget *label; ++#if ICONS_IN_DIALOGS ++ GtkWidget *hbox; + GtkWidget *img; ++#endif + void **buttons; + char *label_text; + char *primary_esc, *secondary_esc; +@@ -584,6 +598,7 @@ + gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE); + gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), GAIM_HIG_BORDER); + ++#if ICONS_IN_DIALOGS + /* Setup the main horizontal box */ + hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); + gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); +@@ -597,7 +612,10 @@ + /* Vertical box */ + vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); + gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0); +- ++#else ++ vbox = GTK_DIALOG(dialog)->vbox; ++#endif ++ + /* Descriptive label */ + primary_esc = (primary != NULL) ? g_markup_escape_text(primary, -1) : NULL; + secondary_esc = (secondary != NULL) ? g_markup_escape_text(secondary, -1) : NULL; +@@ -620,10 +638,12 @@ + + + if (default_action == GAIM_DEFAULT_ACTION_NONE) { ++#if ICONS_IN_DIALOGS + GTK_WIDGET_SET_FLAGS(img, GTK_CAN_DEFAULT); + GTK_WIDGET_SET_FLAGS(img, GTK_CAN_FOCUS); + gtk_widget_grab_focus(img); + gtk_widget_grab_default(img); ++#endif + } else + gtk_dialog_set_default_response(GTK_DIALOG(dialog), default_action); + +@@ -1351,13 +1371,15 @@ + GtkWidget *win; + GtkWidget *vbox; + GtkWidget *vbox2; +- GtkWidget *hbox; + GtkWidget *bbox; + GtkWidget *frame; + GtkWidget *label; + GtkWidget *table; + GtkWidget *button; ++#if ICONS_IN_DIALOGS ++ GtkWidget *hbox; + GtkWidget *img; ++#endif + GtkWidget *sw; + GtkSizeGroup *sg; + GList *gl, *fl; +@@ -1392,6 +1414,7 @@ + g_signal_connect(G_OBJECT(win), "delete_event", + G_CALLBACK(destroy_multifield_cb), data); + ++#if ICONS_IN_DIALOGS + /* Setup the main horizontal box */ + hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); + gtk_container_add(GTK_CONTAINER(win), hbox); +@@ -1407,6 +1430,10 @@ + /* Setup the vbox */ + vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); + gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0); ++#else ++ vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); ++ gtk_container_add(GTK_CONTAINER(win), vbox); ++#endif + gtk_widget_show(vbox); + + sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); diff --git a/packages/obsolete/gaim/files/02-request-field-dialogs.patch b/packages/obsolete/gaim/files/02-request-field-dialogs.patch new file mode 100644 index 0000000000..50529ca53e --- /dev/null +++ b/packages/obsolete/gaim/files/02-request-field-dialogs.patch @@ -0,0 +1,116 @@ +Identiske underkataloger: src2/CVS og src/CVS +Identiske underkataloger: src2/.deps og src/.deps +Index: gaim/src/gtkgaim.h +=================================================================== +--- gaim.orig/src/gtkgaim.h 2005-08-19 21:46:09.550560256 +0200 ++++ gaim/src/gtkgaim.h 2005-08-19 21:47:37.276223928 +0200 +@@ -66,5 +66,11 @@ + */ + #define ICONS_IN_DIALOGS 0 + ++/** ++ * How many fields is there screen-space for vertically, before a scrollbar is needed? ++ */ ++#define VERT_ITEMS 0 ++ ++ + #endif /* _GAIM_GTKGAIM_H_ */ + +Index: gaim/src/gtkrequest.c +=================================================================== +--- gaim.orig/src/gtkrequest.c 2005-08-19 21:46:09.550560256 +0200 ++++ gaim/src/gtkrequest.c 2005-08-19 21:53:46.782050504 +0200 +@@ -1381,6 +1381,8 @@ + GtkWidget *img; + #endif + GtkWidget *sw; ++ GtkWidget *pri_label; ++ GtkWidget *sec_label; + GtkSizeGroup *sg; + GList *gl, *fl; + GaimRequestFieldGroup *group; +@@ -1450,6 +1452,7 @@ + gtk_misc_set_alignment(GTK_MISC(label), 0, 0); + gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0); + gtk_widget_show(label); ++ pri_label = label; + g_free(label_text); + } + +@@ -1457,7 +1460,7 @@ + gl = gl->next) + total_fields += g_list_length(gaim_request_field_group_get_fields(gl->data)); + +- if(total_fields > 9) { ++ if(total_fields > VERT_ITEMS) { + sw = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), + GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); +@@ -1484,6 +1487,7 @@ + gtk_misc_set_alignment(GTK_MISC(label), 0, 0); + gtk_box_pack_start(GTK_BOX(vbox2), label, TRUE, TRUE, 0); + gtk_widget_show(label); ++ sec_label = label; + } + + for (gl = gaim_request_fields_get_groups(fields); +@@ -1718,6 +1722,59 @@ + + gtk_widget_show(win); + ++ //Wait for the window to have recieved its "configure_event", ++ //which means it has been resized by the WM ++ while (gtk_events_pending ()) gtk_main_iteration (); ++ ++ //Get allocated size, and adjust widgets accordingly ++ int w, h, field_labels_w; ++ GtkRequisition sg_labels_req; ++ gtk_window_get_size(GTK_WINDOW(win), &w, &h); ++ field_labels_w = label->allocation.width + GAIM_HIG_BORDER*2; //The width of the largest field-label ++ ++ printf("%d / %d\n", field_labels_w, w); ++ ++ w = w - GAIM_HIG_BORDER * 2; ++ if (primary) gtk_widget_set_size_request(GTK_WIDGET(pri_label), w, -1); ++ if (secondary) gtk_widget_set_size_request(GTK_WIDGET(sec_label), w, -1); ++ ++ //Determine what to do - add a scrollbar or resize the input fields? ++ if ((float)field_labels_w / w > 0.5) //if the labels fill more than half the screen add a horizontal scrollbar ++ { ++ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), ++ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); ++ } ++ else //resize the input fields ++ { ++ for (gl = gaim_request_fields_get_groups(fields); ++ gl != NULL; ++ gl = gl->next) ++ { ++ GList *field_list; ++ size_t field_count = 0; ++ size_t cols = 1; ++ size_t rows; ++ size_t col_num; ++ size_t row_num = 0; ++ ++ group = gl->data; ++ field_list = gaim_request_field_group_get_fields(group); ++ ++ for (row_num = 0, fl = field_list; ++ row_num < rows && fl != NULL; ++ row_num++) ++ { ++ for (col_num = 0; ++ col_num < cols && fl != NULL; ++ col_num++, fl = fl->next) ++ { ++ field = fl->data; ++ gtk_widget_set_size_request(GTK_WIDGET(field->ui_data), w-field_labels_w, -1); ++ } ++ } ++ } ++ } ++ + return data; + } + diff --git a/packages/obsolete/gaim/files/03-blist-dialogs.patch b/packages/obsolete/gaim/files/03-blist-dialogs.patch new file mode 100644 index 0000000000..62d4710d46 --- /dev/null +++ b/packages/obsolete/gaim/files/03-blist-dialogs.patch @@ -0,0 +1,240 @@ +Identiske underkataloger: src2/CVS og src/CVS +Identiske underkataloger: src2/.deps og src/.deps +Index: gaim/src/gtkblist.c +=================================================================== +--- gaim.orig/src/gtkblist.c 2005-08-19 21:57:30.272074856 +0200 ++++ gaim/src/gtkblist.c 2005-08-19 21:57:42.030287336 +0200 +@@ -825,6 +825,15 @@ + joinchat_set_sensitive_if_input_cb(NULL, data); + + gtk_widget_show_all(data->entries_box); ++ ++ GList* children; ++ children = GTK_BOX(data->entries_box)->children; ++ while (children) ++ { ++ //Let the prilabel handle the maxsize ++ gtk_widget_set_size_request(((GtkBoxChild*)(children->data))->widget, 0, -1); ++ children = children->next; ++ } + } + + static void +@@ -916,12 +925,26 @@ + #else + vbox = GTK_DIALOG(data->window)->vbox; + #endif ++ ++ //Make a scrollview to accomodate it all ++ sw = gtk_scrolled_window_new(NULL, NULL); ++ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), ++ GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); ++ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), ++ GTK_SHADOW_NONE); ++ gtk_widget_set_size_request(sw, -1, 200); ++ gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0); ++ gtk_widget_show(sw); ++ ++ vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); ++ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw), vbox); + + label = gtk_label_new(_("Please enter the appropriate information " + "about the chat you would like to join.\n")); + gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0); + gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); ++ pri_label = label; + + rowbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); + gtk_box_pack_start(GTK_BOX(vbox), rowbox, TRUE, TRUE, 0); +@@ -955,6 +978,22 @@ + g_object_unref(data->sg); + + gtk_widget_show_all(data->window); ++ ++ //Wait for the window to have recieved its "configure_event", ++ //which means it has been resized by the WM ++ while (gtk_events_pending ()) gtk_main_iteration (); ++ ++ //Get allocated size, and adjust widgets accordingly ++ int w, h; ++ gtk_window_get_size(GTK_WINDOW(data->window), &w, &h); ++ ++ // Window_border Scrollbar (FFH) ++ w = w - GAIM_HIG_BORDER * 2 - GAIM_HIG_BORDER * 4; ++ gtk_widget_set_size_request(GTK_WIDGET(pri_label), w, -1); ++ ++ //Let the prilabel handle the maxsize ++ gtk_widget_set_size_request(GTK_WIDGET(data->account_menu), 0, -1); ++ gtk_widget_set_size_request(GTK_WIDGET(data->entries_box), 0, -1); + } + + static void gtk_blist_row_expanded_cb(GtkTreeView *tv, GtkTreeIter *iter, GtkTreePath *path, gpointer user_data) { +@@ -4364,6 +4403,19 @@ + vbox = GTK_DIALOG(data->window)->vbox; + #endif + ++ //Make a scrollview to accomodate it all ++ sw = gtk_scrolled_window_new(NULL, NULL); ++ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), ++ GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); ++ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), ++ GTK_SHADOW_NONE); ++ gtk_widget_set_size_request(sw, -1, 200); ++ gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0); ++ gtk_widget_show(sw); ++ ++ vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); ++ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw), vbox); ++ + label = gtk_label_new( + _("Please enter the screen name of the person you would like " + "to add to your buddy list. You may optionally enter an alias, " +@@ -4374,6 +4426,7 @@ + gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0); + gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); ++ pri_label = label; + + hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); + gtk_container_add(GTK_CONTAINER(vbox), hbox); +@@ -4446,6 +4499,25 @@ + + if (group != NULL) + gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(data->combo)->entry), group); ++ ++ //Wait for the window to have recieved its "configure_event", ++ //which means it has been resized by the WM ++ while (gtk_events_pending ()) gtk_main_iteration (); ++ ++ //Get allocated size, and adjust widgets accordingly ++ int w, h, field_labels_w; ++ gtk_window_get_size(GTK_WINDOW(data->window), &w, &h); ++ field_labels_w = label->allocation.width + GAIM_HIG_BORDER*2; //The width of the largest field-label ++ ++ // Window_border Scrollbar (FFH) ++ w = w - GAIM_HIG_BORDER * 2 - GAIM_HIG_BORDER * 4; ++ gtk_widget_set_size_request(GTK_WIDGET(pri_label), w, -1); ++ //Set the size of the input fields ++ gtk_widget_set_size_request(GTK_WIDGET(data->entry), w-field_labels_w, -1); ++ gtk_widget_set_size_request(GTK_WIDGET(data->entry_for_alias), w-field_labels_w, -1); ++ gtk_widget_set_size_request(GTK_WIDGET(data->combo), w-field_labels_w, -1); ++ gtk_widget_set_size_request(GTK_WIDGET(data->account_box), w-field_labels_w, -1); ++ + } + + static void +@@ -4572,6 +4644,9 @@ + GHashTable *defaults = NULL; + struct proto_chat_entry *pce; + gboolean focus = TRUE; ++ GtkWidget *label; ++ GtkWidget *rowbox; ++ GtkWidget *input; + + g_return_if_fail(data->account != NULL); + +@@ -4596,10 +4671,6 @@ + + for (tmp = list; tmp; tmp = tmp->next) + { +- GtkWidget *label; +- GtkWidget *rowbox; +- GtkWidget *input; +- + pce = tmp->data; + + rowbox = gtk_hbox_new(FALSE, 5); +@@ -4657,6 +4728,15 @@ + addchat_set_sensitive_if_input_cb(NULL, data); + + gtk_widget_show_all(data->entries_box); ++ ++ GList* children; ++ children = GTK_BOX(data->entries_box)->children; ++ while (children) ++ { ++ //Let the prilabel handle the maxsize ++ gtk_widget_set_size_request(((GtkBoxChild*)(children->data))->widget, 0, -1); ++ children = children->next; ++ } + } + + static void +@@ -4759,6 +4839,19 @@ + vbox = GTK_DIALOG(data->window)->vbox; + #endif + ++ //Make a scrollview to accomodate it all ++ sw = gtk_scrolled_window_new(NULL, NULL); ++ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), ++ GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); ++ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), ++ GTK_SHADOW_NONE); ++ gtk_widget_set_size_request(sw, -1, 200); ++ gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0); ++ gtk_widget_show(sw); ++ ++ vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); ++ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw), vbox); ++ + label = gtk_label_new( + _("Please enter an alias, and the appropriate information " + "about the chat you would like to add to your buddy list.\n")); +@@ -4766,7 +4859,8 @@ + gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0); + gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); +- ++ pri_label = label; ++ + rowbox = gtk_hbox_new(FALSE, 5); + gtk_box_pack_start(GTK_BOX(vbox), rowbox, FALSE, FALSE, 0); + +@@ -4825,6 +4919,24 @@ + G_CALLBACK(add_chat_resp_cb), data); + + gtk_widget_show_all(data->window); ++ ++ //Wait for the window to have recieved its "configure_event", ++ //which means it has been resized by the WM ++ while (gtk_events_pending ()) gtk_main_iteration (); ++ ++ //Get allocated size, and adjust the label accordingly ++ int w, h; ++ gtk_window_get_size(GTK_WINDOW(data->window), &w, &h); ++ ++ // Window_border Scrollbar (FFH) ++ w = w - GAIM_HIG_BORDER * 2 - GAIM_HIG_BORDER * 4; ++ gtk_widget_set_size_request(GTK_WIDGET(pri_label), w, -1); ++ //Let the prilabel handle the maxsize ++ gtk_widget_set_size_request(GTK_WIDGET(data->account_menu), 0, -1); ++ gtk_widget_set_size_request(GTK_WIDGET(data->entries_box), 0, -1); ++ gtk_widget_set_size_request(GTK_WIDGET(data->alias_entry), 0, -1); ++ gtk_widget_set_size_request(GTK_WIDGET(data->group_combo), 0, -1); ++ + } + + static void +Index: gaim/src/gtkrequest.c +=================================================================== +--- gaim.orig/src/gtkrequest.c 2005-08-19 21:57:30.273074704 +0200 ++++ gaim/src/gtkrequest.c 2005-08-19 21:58:05.468724152 +0200 +@@ -650,6 +650,17 @@ + /* Show everything. */ + gtk_widget_show_all(dialog); + ++ //Wait for the window to have recieved its "configure_event", ++ //which means it has been resized by the WM ++ while (gtk_events_pending ()) gtk_main_iteration (); ++ ++ //Get allocated size, and adjust widgets accordingly ++ int w, h; ++ gtk_window_get_size(GTK_WINDOW(dialog), &w, &h); ++ ++ w = w - GAIM_HIG_BORDER * 2; ++ gtk_widget_set_size_request(GTK_WIDGET(label), w, -1); ++ + return data; + } + diff --git a/packages/obsolete/gaim/files/04-saved-status-dialogs.patch b/packages/obsolete/gaim/files/04-saved-status-dialogs.patch new file mode 100644 index 0000000000..2cdf70c5c1 --- /dev/null +++ b/packages/obsolete/gaim/files/04-saved-status-dialogs.patch @@ -0,0 +1,40 @@ +Identiske underkataloger: src2/CVS og src/CVS +Identiske underkataloger: src2/.deps og src/.deps +Index: gaim/src/gtksavedstatuses.c +=================================================================== +--- gaim.orig/src/gtksavedstatuses.c 2005-08-13 07:54:33.000000000 +0200 ++++ gaim/src/gtksavedstatuses.c 2005-08-19 21:20:41.806812608 +0200 +@@ -417,6 +417,7 @@ + bbox = gtk_hbutton_box_new(); + gtk_box_set_spacing(GTK_BOX(bbox), GAIM_HIG_BOX_SPACE); + gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END); ++ gtk_button_box_set_child_size(GTK_BUTTON_BOX(bbox), 20, -1); //DEPRECATED FFH + gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, TRUE, 0); + gtk_widget_show(bbox); + +@@ -449,12 +450,13 @@ + G_CALLBACK(status_window_delete_cb), dialog); + + /* Close button */ +- button = gtk_button_new_from_stock(GTK_STOCK_CLOSE); ++ //We can do without the close button to save screen estate ++ /*button = gtk_button_new_from_stock(GTK_STOCK_CLOSE); + gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0); + gtk_widget_show(button); + + g_signal_connect(G_OBJECT(button), "clicked", +- G_CALLBACK(status_window_close_cb), dialog); ++ G_CALLBACK(status_window_close_cb), dialog);*/ + + gtk_widget_show(win); + } +@@ -790,7 +792,8 @@ + disclosure = gaim_disclosure_new(_("Use a different status for some accounts"), + _("Use a different status for some accounts")); + gtk_box_pack_start(GTK_BOX(vbox), disclosure, FALSE, FALSE, 0); +- gtk_widget_show(disclosure); ++ //For now, do without the custom messages - not implemented yet ++ //gtk_widget_show(disclosure); + + /* Setup the box that the disclosure will cover */ + dbox = gtk_vbox_new(FALSE, GAIM_HIG_CAT_SPACE); diff --git a/packages/obsolete/gaim/files/05-statusbox-icon-size.patch b/packages/obsolete/gaim/files/05-statusbox-icon-size.patch new file mode 100644 index 0000000000..e18f3b2bcb --- /dev/null +++ b/packages/obsolete/gaim/files/05-statusbox-icon-size.patch @@ -0,0 +1,11 @@ +--- gaim.ori/src/gtkstatusbox.c 2005-09-04 20:42:29.000000000 +0200 ++++ gaim/src/gtkstatusbox.c 2005-09-05 08:44:13.000000000 +0200 +@@ -173,7 +173,7 @@ + + text_rend = gtk_cell_renderer_text_new(); + icon_rend = gtk_cell_renderer_pixbuf_new(); +- icon_size = gtk_icon_size_from_name(GAIM_ICON_SIZE_STATUS); ++ icon_size = GTK_ICON_SIZE_SMALL_TOOLBAR; + + status_box->imhtml_visible = FALSE; + status_box->error_pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), GAIM_STOCK_STATUS_OFFLINE, diff --git a/packages/obsolete/gaim/files/06-account-dialogs.patch b/packages/obsolete/gaim/files/06-account-dialogs.patch new file mode 100644 index 0000000000..9d2cb9acb0 --- /dev/null +++ b/packages/obsolete/gaim/files/06-account-dialogs.patch @@ -0,0 +1,219 @@ +Index: gaim/src/gtkaccount.c +=================================================================== +--- gaim.orig/src/gtkaccount.c 2005-08-25 17:16:44.000000000 +0200 ++++ gaim/src/gtkaccount.c 2005-08-29 22:34:25.511003600 +0200 +@@ -857,7 +857,6 @@ + { + GtkWidget *frame; + GtkWidget *vbox; +- GtkWidget *vbox2; + GtkWidget *hbox; + GtkWidget *hbox2; + GtkWidget *button; +@@ -901,12 +900,8 @@ + gaim_set_accessible_label (dialog->icon_entry, label); + dialog->icon_path = NULL; + +- vbox2 = gtk_vbox_new(FALSE, 0); +- gtk_box_pack_start(GTK_BOX(hbox), vbox2, TRUE, TRUE, 0); +- gtk_widget_show(vbox2); +- + hbox2 = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); +- gtk_box_pack_start(GTK_BOX(vbox2), hbox2, FALSE, FALSE, GAIM_HIG_BORDER); ++ gtk_box_pack_start(GTK_BOX(vbox), hbox2, FALSE, FALSE, GAIM_HIG_BORDER); + gtk_widget_show(hbox2); + + button = gtk_button_new_from_stock(GTK_STOCK_OPEN); +@@ -1275,7 +1270,18 @@ + gtk_option_menu_get_menu(GTK_OPTION_MENU(dialog->proxy_dropdown)); + #endif + +- add_pref_box(dialog, vbox, _("Proxy _type:"), dialog->proxy_dropdown); ++ GtkWidget *label; ++ label = gtk_label_new_with_mnemonic(_("Proxy _type:")); ++ gtk_size_group_add_widget(dialog->sg, label); ++ gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); ++ gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); ++ gtk_widget_show(label); ++ ++ gtk_box_pack_start(GTK_BOX(vbox), dialog->proxy_dropdown, TRUE, TRUE, GAIM_HIG_BORDER); ++ gtk_widget_show(dialog->proxy_dropdown); ++ gaim_set_accessible_label (dialog->proxy_dropdown, label); ++ ++ //add_pref_box(dialog, vbox, _("Proxy _type:"), dialog->proxy_dropdown); + + /* Setup the second vbox, which may be hidden at times. */ + dialog->proxy_vbox = vbox2 = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); +@@ -1643,6 +1649,7 @@ + AccountPrefsDialog *dialog; + GtkWidget *win; + GtkWidget *main_vbox; ++ GtkWidget *sw; + GtkWidget *vbox; + GtkWidget *bbox; + GtkWidget *dbox; +@@ -1709,10 +1716,19 @@ + gtk_box_pack_start(GTK_BOX(main_vbox), notebook, FALSE, FALSE, 0); + + /* Setup the inner vbox */ ++ //With a scrollbox ++ sw = gtk_scrolled_window_new(NULL, NULL); ++ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), ++ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); ++ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), ++ GTK_SHADOW_NONE); ++ gtk_widget_set_size_request(sw, -1, -1); ++ gtk_notebook_append_page(GTK_NOTEBOOK(notebook), sw, ++ gtk_label_new_with_mnemonic("_Basic")); ++ gtk_widget_show(sw); + dialog->top_vbox = vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); + gtk_container_set_border_width(GTK_CONTAINER(vbox), GAIM_HIG_BORDER); +- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox, +- gtk_label_new_with_mnemonic("_Basic")); ++ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw), vbox); + gtk_widget_show(vbox); + + /* Setup the top frames. */ +@@ -1720,10 +1736,20 @@ + add_user_options(dialog, vbox); + + /* Setup the page with 'Advanced'. */ ++ //With a scrollbox ++ sw = gtk_scrolled_window_new(NULL, NULL); ++ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), ++ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); ++ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), ++ GTK_SHADOW_NONE); ++ gtk_widget_set_size_request(sw, -1, -1); ++ gtk_notebook_append_page(GTK_NOTEBOOK(notebook), sw, ++ gtk_label_new_with_mnemonic("_Advanced")); ++ gtk_widget_show(sw); + dialog->bottom_vbox = dbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER); + gtk_container_set_border_width(GTK_CONTAINER(dbox), GAIM_HIG_BORDER); +- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), dbox, +- gtk_label_new_with_mnemonic("_Advanced")); ++ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw), dbox); ++ gtk_widget_show(dbox); + + /** Setup the bottom frames. */ + add_protocol_options(dialog, dbox); +@@ -1731,46 +1757,50 @@ + add_proxy_options(dialog, dbox); + + /* Setup the button box */ +- bbox = gtk_hbutton_box_new(); ++ //bbox = gtk_hbutton_box_new(); ++ //Replaced with a hbox, otherwise the Register-button doesn't fit (same size required) ++ bbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER); + gtk_box_set_spacing(GTK_BOX(bbox), GAIM_HIG_BOX_SPACE); +- gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END); + gtk_box_pack_end(GTK_BOX(main_vbox), bbox, FALSE, TRUE, 0); + gtk_widget_show(bbox); + +- /* Register button */ +- button = gtk_button_new_with_label(_("Register")); +- gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0); +- gtk_widget_show(button); +- +- g_signal_connect(G_OBJECT(button), "clicked", +- G_CALLBACK(register_account_prefs_cb), dialog); +- +- dialog->register_button = button; +- ++ /* Save button */ ++ button = gtk_button_new_from_stock(GTK_STOCK_SAVE); ++ gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0); ++ + if (dialog->account == NULL) + gtk_widget_set_sensitive(button, FALSE); + +- if (!dialog->prpl_info || !dialog->prpl_info->register_user) +- gtk_widget_hide(button); ++ gtk_widget_show(button); ++ ++ dialog->ok_button = button; ++ ++ g_signal_connect(G_OBJECT(button), "clicked", ++ G_CALLBACK(ok_account_prefs_cb), dialog); + + /* Cancel button */ + button = gtk_button_new_from_stock(GTK_STOCK_CANCEL); +- gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0); ++ gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0); + gtk_widget_show(button); + + g_signal_connect(G_OBJECT(button), "clicked", + G_CALLBACK(cancel_account_prefs_cb), dialog); + +- /* Save button */ +- button = gtk_button_new_from_stock(GTK_STOCK_SAVE); +- gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0); ++ /* Register button */ ++ button = gtk_button_new_with_label(_("Register")); ++ gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0); ++ gtk_widget_show(button); ++ ++ g_signal_connect(G_OBJECT(button), "clicked", ++ G_CALLBACK(register_account_prefs_cb), dialog); ++ ++ dialog->register_button = button; + + if (dialog->account == NULL) + gtk_widget_set_sensitive(button, FALSE); + +- gtk_widget_show(button); +- +- dialog->ok_button = button; ++ if (!dialog->prpl_info || !dialog->prpl_info->register_user) ++ gtk_widget_hide(button); + + /* Set up DND */ + gtk_drag_dest_set(dialog->window, +@@ -1783,11 +1813,20 @@ + g_signal_connect(G_OBJECT(dialog->window), "drag_data_received", + G_CALLBACK(account_dnd_recv), dialog); + +- g_signal_connect(G_OBJECT(button), "clicked", +- G_CALLBACK(ok_account_prefs_cb), dialog); +- + /* Show the window. */ + gtk_widget_show(win); ++ ++ //Wait for the window to have recieved its "configure_event", ++ //which means it has been resized by the WM ++ while (gtk_events_pending ()) gtk_main_iteration (); ++ ++ //Get allocated size, and adjust widgets accordingly ++ int w, h; ++ gtk_window_get_size(GTK_WINDOW(win), &w, &h); ++ ++ w = w - GAIM_HIG_BORDER * 2; ++ gtk_widget_set_size_request(GTK_WIDGET(dialog->protocol_menu), w, -1); ++ + } + + /************************************************************************** +@@ -2389,6 +2428,7 @@ + bbox = gtk_hbutton_box_new(); + gtk_box_set_spacing(GTK_BOX(bbox), GAIM_HIG_BOX_SPACE); + gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END); ++ gtk_button_box_set_child_size(GTK_BUTTON_BOX(bbox), 20, -1); //DEPRECATED FFH + gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, TRUE, 0); + gtk_widget_show(bbox); + +@@ -2421,12 +2461,13 @@ + G_CALLBACK(ask_delete_account_cb), dialog); + + /* Close button */ +- button = gtk_button_new_from_stock(GTK_STOCK_CLOSE); ++ //We can do without the close button to save screen estate ++ /*button = gtk_button_new_from_stock(GTK_STOCK_CLOSE); + gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0); + gtk_widget_show(button); + + g_signal_connect(G_OBJECT(button), "clicked", +- G_CALLBACK(close_accounts_cb), dialog); ++ G_CALLBACK(close_accounts_cb), dialog);*/ + + /* Setup some gaim signal handlers. */ + gaim_signal_connect(gaim_connections_get_handle(), "signed-on", diff --git a/packages/obsolete/gaim/files/07-roomlist-dialog.patch b/packages/obsolete/gaim/files/07-roomlist-dialog.patch new file mode 100644 index 0000000000..2806c78fd4 --- /dev/null +++ b/packages/obsolete/gaim/files/07-roomlist-dialog.patch @@ -0,0 +1,67 @@ +Index: gaim/src/gtkroomlist.c +=================================================================== +--- gaim.orig/src/gtkroomlist.c 2005-08-13 01:53:28.000000000 +0200 ++++ gaim/src/gtkroomlist.c 2005-08-19 21:37:26.225117816 +0200 +@@ -129,7 +129,9 @@ + gtk_container_add(GTK_CONTAINER(dialog->sw), rl->tree); + + gtk_widget_set_sensitive(dialog->stop_button, TRUE); ++ gtk_widget_show(dialog->stop_button); + gtk_widget_set_sensitive(dialog->list_button, FALSE); ++ gtk_widget_hide(dialog->list_button); + gtk_widget_set_sensitive(dialog->join_button, FALSE); + } + +@@ -141,7 +143,9 @@ + gtk_widget_set_sensitive(dialog->account_widget, TRUE); + + gtk_widget_set_sensitive(dialog->stop_button, FALSE); ++ gtk_widget_hide(dialog->stop_button); + gtk_widget_set_sensitive(dialog->list_button, TRUE); ++ gtk_widget_show(dialog->list_button); + gtk_widget_set_sensitive(dialog->join_button, FALSE); + } + +@@ -396,7 +400,7 @@ + g_signal_connect(G_OBJECT(dialog->stop_button), "clicked", + G_CALLBACK(stop_button_cb), dialog); + gtk_widget_set_sensitive(dialog->stop_button, FALSE); +- gtk_widget_show(dialog->stop_button); ++ //gtk_widget_show(dialog->stop_button); + + /* list button */ + dialog->list_button = gtk_button_new_with_mnemonic(_("_Get List")); +@@ -415,11 +419,12 @@ + gtk_widget_show(dialog->join_button); + + /* close button */ +- dialog->close_button = gtk_button_new_from_stock(GTK_STOCK_CLOSE); ++ //We can do without the close button to save screen estate ++ /*dialog->close_button = gtk_button_new_from_stock(GTK_STOCK_CLOSE); + gtk_box_pack_start(GTK_BOX(bbox), dialog->close_button, FALSE, FALSE, 0); + g_signal_connect(G_OBJECT(dialog->close_button), "clicked", + G_CALLBACK(close_button_cb), dialog); +- gtk_widget_show(dialog->close_button); ++ gtk_widget_show(dialog->close_button);*/ + + /* show the dialog window and return the dialog */ + gtk_widget_show(dialog->window); +@@ -683,14 +688,18 @@ + if (rl->dialog->account_widget) + gtk_widget_set_sensitive(rl->dialog->account_widget, FALSE); + gtk_widget_set_sensitive(rl->dialog->stop_button, TRUE); ++ gtk_widget_show(rl->dialog->stop_button); + gtk_widget_set_sensitive(rl->dialog->list_button, FALSE); ++ gtk_widget_hide(rl->dialog->list_button); + } else { + rl->dialog->pg_needs_pulse = FALSE; + gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(rl->dialog->progress), 0.0); + if (rl->dialog->account_widget) + gtk_widget_set_sensitive(rl->dialog->account_widget, TRUE); + gtk_widget_set_sensitive(rl->dialog->stop_button, FALSE); ++ gtk_widget_hide(rl->dialog->stop_button); + gtk_widget_set_sensitive(rl->dialog->list_button, TRUE); ++ gtk_widget_show(rl->dialog->list_button); + } + } + diff --git a/packages/obsolete/gaim/files/08-prefs-dialog.patch b/packages/obsolete/gaim/files/08-prefs-dialog.patch new file mode 100644 index 0000000000..a8fcb89311 --- /dev/null +++ b/packages/obsolete/gaim/files/08-prefs-dialog.patch @@ -0,0 +1,64 @@ +--- gaim.ori/src/gtkprefs.c 2005-09-05 08:28:17.000000000 +0200 ++++ gaim/src/gtkprefs.c 2005-09-05 09:06:27.000000000 +0200 +@@ -2108,12 +2108,18 @@ + if (icon) + g_object_unref(icon); + +-#if GTK_CHECK_VERSION(2,4,0) +- return gtk_notebook_append_page(GTK_NOTEBOOK(prefsnotebook), page, gtk_label_new(text)); +-#else +- gtk_notebook_append_page(GTK_NOTEBOOK(prefsnotebook), page, gtk_label_new(text)); +- return gtk_notebook_page_num(GTK_NOTEBOOK(prefsnotebook), page); +-#endif ++ //Add a scrolled window around the page contents ++ GtkWidget *sw; ++ sw = gtk_scrolled_window_new(NULL, NULL); ++ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), ++ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); ++ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), ++ GTK_SHADOW_NONE); ++ //gtk_widget_set_size_request(sw, -1, 200); ++ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw), page); ++ ++ ++ return gtk_notebook_append_page(GTK_NOTEBOOK(prefsnotebook), sw, gtk_label_new(text)); + } + + static void prefs_notebook_init() { +@@ -2146,9 +2152,9 @@ + void gaim_gtk_prefs_show(void) + { + GtkWidget *vbox; +- GtkWidget *bbox; ++ //GtkWidget *bbox; + GtkWidget *notebook; +- GtkWidget *button; ++ //GtkWidget *button; + + if (prefs) { + gtk_window_present(GTK_WINDOW(prefs)); +@@ -2176,11 +2182,13 @@ + + /* The notebook */ + prefsnotebook = notebook = gtk_notebook_new (); +- gtk_box_pack_start (GTK_BOX (vbox), notebook, FALSE, FALSE, 0); ++ gtk_notebook_set_scrollable(GTK_NOTEBOOK(prefsnotebook), TRUE); ++ gtk_box_pack_start (GTK_BOX (vbox), notebook, TRUE, TRUE, 0); + + + /* The buttons to press! */ +- bbox = gtk_hbutton_box_new(); ++ //To save screen estate we will do without a close button ++ /*bbox = gtk_hbutton_box_new(); + gtk_box_set_spacing(GTK_BOX(bbox), GAIM_HIG_BOX_SPACE); + gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END); + gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0); +@@ -2190,7 +2198,7 @@ + g_signal_connect_swapped(G_OBJECT(button), "clicked", + G_CALLBACK(gtk_widget_destroy), prefs); + gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0); +- gtk_widget_show(button); ++ gtk_widget_show(button);*/ + + prefs_notebook_init(); + diff --git a/packages/obsolete/gaim/files/09-filetransfer-dialog.patch b/packages/obsolete/gaim/files/09-filetransfer-dialog.patch new file mode 100644 index 0000000000..c4fa3a0a6d --- /dev/null +++ b/packages/obsolete/gaim/files/09-filetransfer-dialog.patch @@ -0,0 +1,52 @@ +Index: gaim/src/gtkft.c +=================================================================== +--- gaim.orig/src/gtkft.c 2005-08-21 01:59:50.000000000 +0200 ++++ gaim/src/gtkft.c 2005-08-29 23:05:02.000000000 +0200 +@@ -772,24 +772,26 @@ + G_CALLBACK(open_button_cb), dialog); + + /* Pause button */ +- button = gtk_button_new_with_mnemonic(_("_Pause")); ++ /* Pause button has no function*/ ++ /*button = gtk_button_new_with_mnemonic(_("_Pause")); + gtk_widget_set_sensitive(button, FALSE); + gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0); + gtk_widget_show(button); + dialog->pause_button = button; + + g_signal_connect(G_OBJECT(button), "clicked", +- G_CALLBACK(pause_button_cb), dialog); ++ G_CALLBACK(pause_button_cb), dialog);*/ + + /* Resume button */ +- button = gtk_button_new_with_mnemonic(_("_Resume")); ++ /* Resume button has no function */ ++ /*button = gtk_button_new_with_mnemonic(_("_Resume")); + gtk_widget_set_sensitive(button, FALSE); + gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0); + gtk_widget_show(button); + dialog->resume_button = button; + + g_signal_connect(G_OBJECT(button), "clicked", +- G_CALLBACK(resume_button_cb), dialog); ++ G_CALLBACK(resume_button_cb), dialog);*/ + + /* Remove button */ + button = gtk_button_new_from_stock(GTK_STOCK_REMOVE); +@@ -811,13 +813,14 @@ + G_CALLBACK(stop_button_cb), dialog); + + /* Close button */ +- button = gtk_button_new_from_stock(GTK_STOCK_CLOSE); ++ /* Do without a close button to save screen estate */ ++ /*button = gtk_button_new_from_stock(GTK_STOCK_CLOSE); + gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0); + gtk_widget_show(button); + dialog->close_button = button; + + g_signal_connect(G_OBJECT(button), "clicked", +- G_CALLBACK(close_button_cb), dialog); ++ G_CALLBACK(close_button_cb), dialog);*/ + + return dialog; + } diff --git a/packages/obsolete/gaim/files/10-pda-default-settings.patch b/packages/obsolete/gaim/files/10-pda-default-settings.patch new file mode 100644 index 0000000000..953dc11612 --- /dev/null +++ b/packages/obsolete/gaim/files/10-pda-default-settings.patch @@ -0,0 +1,13 @@ +Index: gaim/src/gtkconv.c +=================================================================== +--- gaim.orig/src/gtkconv.c 2005-08-25 17:16:50.000000000 +0200 ++++ gaim/src/gtkconv.c 2005-08-29 23:56:48.142463528 +0200 +@@ -6126,7 +6126,7 @@ + gaim_prefs_add_bool("/gaim/gtk/conversations/spellcheck", TRUE); + gaim_prefs_add_bool("/gaim/gtk/conversations/show_incoming_formatting", TRUE); + +- gaim_prefs_add_bool("/gaim/gtk/conversations/show_formatting_toolbar", TRUE); ++ gaim_prefs_add_bool("/gaim/gtk/conversations/show_formatting_toolbar", FALSE); + gaim_prefs_add_bool("/gaim/gtk/conversations/passthrough_unknown_commands", FALSE); + + gaim_prefs_add_string("/gaim/gtk/conversations/placement", "last"); diff --git a/packages/obsolete/gaim/files/define-pda-mode.patch b/packages/obsolete/gaim/files/define-pda-mode.patch new file mode 100644 index 0000000000..f1a368bc73 --- /dev/null +++ b/packages/obsolete/gaim/files/define-pda-mode.patch @@ -0,0 +1,36 @@ +Index: gaim/src/gtkgaim.h +=================================================================== +--- gaim.orig/src/gtkgaim.h 2005-08-25 17:29:42.000000000 +0200 ++++ gaim/src/gtkgaim.h 2005-08-25 19:00:37.335318168 +0200 +@@ -57,14 +57,14 @@ + * Spacings between components, as defined by the + * Gnome Human Interface Guidelines. + */ +-#define GAIM_HIG_CAT_SPACE 18 +-#define GAIM_HIG_BORDER 12 +-#define GAIM_HIG_BOX_SPACE 6 ++#define GAIM_HIG_CAT_SPACE 9 ++#define GAIM_HIG_BORDER 6 ++#define GAIM_HIG_BOX_SPACE 3 + + /** + * Do we want icons in dialogs? + */ +-#define ICONS_IN_DIALOGS 1 ++#define ICONS_IN_DIALOGS 0 + + /** + * How many fields is there screen-space for vertically, before a scrollbar is needed? +Index: gaim/src/gtkutils.c +=================================================================== +--- gaim.orig/src/gtkutils.c 2005-08-25 19:01:19.630888264 +0200 ++++ gaim/src/gtkutils.c 2005-08-25 19:02:05.067980776 +0200 +@@ -398,7 +398,7 @@ + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); + gtk_widget_show(hbox); + +- label = gtk_label_new(" "); ++ label = gtk_label_new(" "); + gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); + gtk_widget_show(label); + diff --git a/packages/obsolete/gaim/files/desktop-name-2.0.0.patch b/packages/obsolete/gaim/files/desktop-name-2.0.0.patch new file mode 100644 index 0000000000..c921619721 --- /dev/null +++ b/packages/obsolete/gaim/files/desktop-name-2.0.0.patch @@ -0,0 +1,27 @@ +Index: gaim/gaim.desktop +=================================================================== +--- gaim.orig/gaim.desktop 2005-06-06 03:40:46.000000000 +0200 ++++ gaim/gaim.desktop 2005-08-21 02:00:18.525853592 +0200 +@@ -33,21 +33,7 @@ + GenericName[sq]=Lajmësjellës Internet + GenericName[sv]=Meddelandeklient + GenericName[zh_CN]=互联网通讯程序 +-Name=Gaim Internet Messenger +-Name[da]=Gaim - internet beskeder +-Name[de]=Gaim Internet Messenger +-Name[fr]=Gaim Messagerie Instantanée +-Name[hu]=Gaim IM +-Name[it]=Gaim Internet Messenger +-Name[ko]=게임 메신저 +-Name[nb]=Gaim lynmeldingsklient +-Name[nl]=Gaim - Expresberichten +-Name[pl]=Komunikator Internetowy Gaim +-Name[pt]=Mensageiro Internet Gaim +-Name[sl]=Gaim - spletni sel +-Name[sq]=Lajmësjellësi Internet Gaim +-Name[sv]=Gaim Internet Messenger +-Name[zh_CN]=Gaim 互联网通讯程序 ++Name=Gaim + Exec=gaim + Icon=gaim.png + StartupNotify=true diff --git a/packages/obsolete/gaim/files/desktop-name.patch b/packages/obsolete/gaim/files/desktop-name.patch new file mode 100644 index 0000000000..6095a77e47 --- /dev/null +++ b/packages/obsolete/gaim/files/desktop-name.patch @@ -0,0 +1,10 @@ +--- gaim-1.0.3/gaim.desktop.old 2005-01-01 16:48:58.000000000 +0000 ++++ gaim-1.0.3/gaim.desktop 2005-01-01 16:49:15.000000000 +0000 +@@ -1,6 +1,6 @@ + [Desktop Entry] + Encoding=UTF-8 +-Name=Gaim Internet Messenger ++Name=Gaim + Name[de]=Gaim Internet Messenger + Name[da]=Gaim - internet beskeder + Name[fr]=Gaim Messagerie Instantanée diff --git a/packages/obsolete/gaim/files/desktop-name_1.4.0.patch b/packages/obsolete/gaim/files/desktop-name_1.4.0.patch new file mode 100644 index 0000000000..3cfaa5771e --- /dev/null +++ b/packages/obsolete/gaim/files/desktop-name_1.4.0.patch @@ -0,0 +1,11 @@ +--- gaim-1.4.0/gaim.desktop.old 2005-07-15 00:58:50.000000000 +0200 ++++ gaim-1.4.0/gaim.desktop 2005-07-15 00:59:35.000000000 +0200 +@@ -7,7 +7,7 @@ + Terminal=false + Type=Application + +-Name=Gaim Internet Messenger ++Name=Gaim + Name[ca]=Missatger d'Internet Gaim + Name[cs]=Gaim Internet Messenger + Name[da]=Gaim - internet beskeder diff --git a/packages/obsolete/gaim/files/desktop-name_1.5.0.patch b/packages/obsolete/gaim/files/desktop-name_1.5.0.patch new file mode 100644 index 0000000000..3cfaa5771e --- /dev/null +++ b/packages/obsolete/gaim/files/desktop-name_1.5.0.patch @@ -0,0 +1,11 @@ +--- gaim-1.4.0/gaim.desktop.old 2005-07-15 00:58:50.000000000 +0200 ++++ gaim-1.4.0/gaim.desktop 2005-07-15 00:59:35.000000000 +0200 +@@ -7,7 +7,7 @@ + Terminal=false + Type=Application + +-Name=Gaim Internet Messenger ++Name=Gaim + Name[ca]=Missatger d'Internet Gaim + Name[cs]=Gaim Internet Messenger + Name[da]=Gaim - internet beskeder diff --git a/packages/obsolete/gaim/files/docklet-icon-size.patch b/packages/obsolete/gaim/files/docklet-icon-size.patch new file mode 100644 index 0000000000..6b8047a30c --- /dev/null +++ b/packages/obsolete/gaim/files/docklet-icon-size.patch @@ -0,0 +1,13 @@ +Index: gaim/plugins/docklet/docklet-x11.c +=================================================================== +--- gaim.orig/plugins/docklet/docklet-x11.c 2005-04-02 17:23:28.000000000 +0200 ++++ gaim/plugins/docklet/docklet-x11.c 2005-08-21 02:06:51.869056336 +0200 +@@ -112,7 +112,7 @@ + break; + } + +- gtk_image_set_from_stock(GTK_IMAGE(image), icon_name, GTK_ICON_SIZE_LARGE_TOOLBAR); ++ gtk_image_set_from_stock(GTK_IMAGE(image), icon_name, GTK_ICON_SIZE_SMALL_TOOLBAR); + + #if 0 + GdkPixbuf *p; diff --git a/packages/obsolete/gaim/files/gaim-OE-branding.patch b/packages/obsolete/gaim/files/gaim-OE-branding.patch new file mode 100644 index 0000000000..d090899cac --- /dev/null +++ b/packages/obsolete/gaim/files/gaim-OE-branding.patch @@ -0,0 +1,11 @@ +--- /tmp/irc.h 2005-10-04 14:10:59.699874560 +0200 ++++ gaim/src/protocols/irc/irc.h 2005-10-04 14:13:10.135045400 +0200 +@@ -35,7 +35,7 @@ + #define IRC_DEFAULT_CHARSET "UTF-8" + #define IRC_DEFAULT_ALIAS "gaim" + +-#define IRC_DEFAULT_QUIT "Download Gaim: " GAIM_WEBSITE ++#define IRC_DEFAULT_QUIT "Powered by OE: www.openembedded.org" + + #define IRC_INITIAL_BUFSIZE 1024 + diff --git a/packages/obsolete/gaim/files/gevolution-eds-dbus.patch b/packages/obsolete/gaim/files/gevolution-eds-dbus.patch new file mode 100644 index 0000000000..0b7479d4f7 --- /dev/null +++ b/packages/obsolete/gaim/files/gevolution-eds-dbus.patch @@ -0,0 +1,53 @@ +--- gaim/plugins/gevolution/gevolution.c.orig 2006-02-23 23:30:25.000000000 +0100 ++++ gaim/plugins/gevolution/gevolution.c 2006-02-23 23:31:42.000000000 +0100 +@@ -38,17 +38,12 @@ + +-#include + +-#include +-#include +-#include ++#include ++#include + + #include + + #define GEVOLUTION_PLUGIN_ID "gtk-x11-gevolution" + +-#define E_DATA_BOOK_FACTORY_OAF_ID \ +- "OAFIID:GNOME_Evolution_DataServer_BookFactory" +- + enum + { + COLUMN_AUTOADD, +@@ -324,8 +320,6 @@ + static gboolean + plugin_load(GaimPlugin *plugin) + { +- bonobo_activate(); +- + backup_blist_ui_ops = gaim_blist_get_ui_ops(); + + blist_ui_ops = g_memdup(backup_blist_ui_ops, sizeof(GaimBlistUiOps)); +@@ -370,7 +364,6 @@ + static void + plugin_destroy(GaimPlugin *plugin) + { +- bonobo_debug_shutdown(); + } + + static void +@@ -563,13 +556,6 @@ + * So, in conclusion, this is an evil hack, but it doesn't harm anything + * and it works. + */ +- g_module_make_resident(plugin->handle); +- +- if (!bonobo_init_full(NULL, NULL, bonobo_activation_orb_get(), +- CORBA_OBJECT_NIL, CORBA_OBJECT_NIL)) +- { +- gaim_debug_error("evolution", "Unable to initialize bonobo.\n"); +- } + } + + GAIM_INIT_PLUGIN(gevolution, init_plugin, info) diff --git a/packages/obsolete/gaim/files/gtk-deprecated-2.0.0.patch b/packages/obsolete/gaim/files/gtk-deprecated-2.0.0.patch new file mode 100644 index 0000000000..04bb9244f0 --- /dev/null +++ b/packages/obsolete/gaim/files/gtk-deprecated-2.0.0.patch @@ -0,0 +1,13 @@ +--- gaim/configure.ac.orig 2005-12-19 23:04:14 +0100 ++++ gaim/configure.ac 2005-12-19 23:04:49 +0100 +@@ -442,10 +442,6 @@ + fi + fi + +-if test "x$enable_deprecated" = "xno"; then +- DEBUG_CFLAGS="$DEBUG_CFLAGS -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED" +-fi +- + if test "x$GCC" = "xyes"; then + DEBUG_CFLAGS="-Wall $DEBUG_CFLAGS" + CFLAGS="-g $CFLAGS" diff --git a/packages/obsolete/gaim/files/no-superimposed-version-on-logo.patch b/packages/obsolete/gaim/files/no-superimposed-version-on-logo.patch new file mode 100644 index 0000000000..86809dfe98 --- /dev/null +++ b/packages/obsolete/gaim/files/no-superimposed-version-on-logo.patch @@ -0,0 +1,19 @@ +Index: gaim/src/gtkstock.c +=================================================================== +--- gaim.orig/src/gtkstock.c 2005-08-15 08:52:45.000000000 +0200 ++++ gaim/src/gtkstock.c 2005-08-19 18:13:26.550881552 +0200 +@@ -214,12 +214,12 @@ + + pixbuf = gdk_pixbuf_new_from_file(filename, NULL); + + g_free(filename); + +- if (!strcmp(stock_icons[i].name, GAIM_STOCK_LOGO)) +- gaim_gtk_stock_versionize(&pixbuf, win); ++ /*if (!strcmp(stock_icons[i].name, GAIM_STOCK_LOGO)) ++ gaim_gtk_stock_versionize(&pixbuf, win);*/ + + iconset = gtk_icon_set_new_from_pixbuf(pixbuf); + + g_object_unref(G_OBJECT(pixbuf)); + } diff --git a/packages/obsolete/gaim/files/series b/packages/obsolete/gaim/files/series new file mode 100644 index 0000000000..c7a16f71c1 --- /dev/null +++ b/packages/obsolete/gaim/files/series @@ -0,0 +1,14 @@ +no-superimposed-version-on-logo.patch +01-optional-icons-in-dialogs.patch +02-request-field-dialogs.patch +03-blist-dialogs.patch +04-saved-status-dialogs.patch +05-statusbox-icon-size.patch +06-account-dialogs.patch +07-roomlist-dialog.patch +define-pda-mode.patch +desktop-name-2.0.0.patch +docklet-icon-size.patch +08-prefs-dialog.patch +09-filetransfer-dialog.patch +10-pda-default-settings.patch diff --git a/packages/obsolete/gaim/gaim.inc b/packages/obsolete/gaim/gaim.inc new file mode 100644 index 0000000000..d2fb38881a --- /dev/null +++ b/packages/obsolete/gaim/gaim.inc @@ -0,0 +1,35 @@ +SECTION = "x11/network" +DESCRIPTION = "multi-protocol instant messaging client" +LICENSE = "GPL" + +DEPENDS = "gtk+ gnutls virtual/libintl" +RRECOMMENDS_${PN} = "gaim-protocol-irc gaim-protocol-jabber gaim-plugin-docklet" + +EXTRA_OECONF = "--disable-audio --disable-perl --disable-tcl --disable-deprecated" + +FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \ + ${sysconfdir} ${sharedstatedir} ${localstatedir} \ + /bin /sbin /lib/*.so* ${datadir}/${PN} ${libdir}/${PN}/*.so \ + ${datadir}/pixmaps ${datadir}/applications \ + ${datadir}/idl ${datadir}/omf ${datadir}/sounds \ + ${libdir}/bonobo/servers" +FILES_${PN}-dev += "${libdir}/gaim/*.la" + +inherit autotools gettext + +PACKAGES_DYNAMIC = "gaim-protocol-* gaim-plugin-*" + +python populate_packages_prepend () { + root = bb.data.expand('${libdir}/gaim', d) + + do_split_packages(d, root, '^([^l][^i][^b].*)\.so$', + output_pattern='gaim-plugin-%s', + description='GAIM plugin %s', + prepend=True) + + do_split_packages(d, root, '^lib(.*)\.so$', + output_pattern='gaim-protocol-%s', + description='GAIM protocol plugin for %s', + prepend=True, + aux_files_pattern=['${datadir}/pixmaps/gaim/status/default/%s.png', '${datadir}/pixmaps/gaim/smileys/default/%s_*']) +} diff --git a/packages/obsolete/gaim/gaim_1.0.3.bb b/packages/obsolete/gaim/gaim_1.0.3.bb new file mode 100644 index 0000000000..f833ddde28 --- /dev/null +++ b/packages/obsolete/gaim/gaim_1.0.3.bb @@ -0,0 +1,6 @@ +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \ + file://desktop-name.patch;patch=1" + +require gaim.inc diff --git a/packages/obsolete/gaim/gaim_1.1.0.bb b/packages/obsolete/gaim/gaim_1.1.0.bb new file mode 100644 index 0000000000..f833ddde28 --- /dev/null +++ b/packages/obsolete/gaim/gaim_1.1.0.bb @@ -0,0 +1,6 @@ +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \ + file://desktop-name.patch;patch=1" + +require gaim.inc diff --git a/packages/obsolete/gaim/gaim_1.1.1.bb b/packages/obsolete/gaim/gaim_1.1.1.bb new file mode 100644 index 0000000000..f833ddde28 --- /dev/null +++ b/packages/obsolete/gaim/gaim_1.1.1.bb @@ -0,0 +1,6 @@ +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \ + file://desktop-name.patch;patch=1" + +require gaim.inc diff --git a/packages/obsolete/gaim/gaim_1.1.2.bb b/packages/obsolete/gaim/gaim_1.1.2.bb new file mode 100644 index 0000000000..3bf9aeb3a7 --- /dev/null +++ b/packages/obsolete/gaim/gaim_1.1.2.bb @@ -0,0 +1,9 @@ +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \ + file://desktop-name.patch;patch=1" + +require gaim.inc + +CFLAGS += "-D_GNU_SOURCE" + diff --git a/packages/obsolete/gaim/gaim_1.4.0.bb b/packages/obsolete/gaim/gaim_1.4.0.bb new file mode 100644 index 0000000000..1585229b14 --- /dev/null +++ b/packages/obsolete/gaim/gaim_1.4.0.bb @@ -0,0 +1,9 @@ +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \ + file://desktop-name_1.4.0.patch;patch=1" + +require gaim.inc + +CFLAGS += "-D_GNU_SOURCE" + diff --git a/packages/obsolete/gaim/gaim_1.5.0.bb b/packages/obsolete/gaim/gaim_1.5.0.bb new file mode 100644 index 0000000000..3bf9aeb3a7 --- /dev/null +++ b/packages/obsolete/gaim/gaim_1.5.0.bb @@ -0,0 +1,9 @@ +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \ + file://desktop-name.patch;patch=1" + +require gaim.inc + +CFLAGS += "-D_GNU_SOURCE" + diff --git a/packages/obsolete/gaim/gaim_2.0.0-cvs-mco1.bb b/packages/obsolete/gaim/gaim_2.0.0-cvs-mco1.bb new file mode 100644 index 0000000000..bf8591920c --- /dev/null +++ b/packages/obsolete/gaim/gaim_2.0.0-cvs-mco1.bb @@ -0,0 +1,44 @@ +PR = "r3" +SRCDATE_${PN} = "20050904" +#Change to x.y.z+cvs${SRCDATE}-mco1 when 2.0.0 changes +PV = "2.0.0-cvs-mco1-${SRCDATE}" + +DEFAULT_PREFERENCE = "-1" + +WEBCVSURL = "http://handhelds.org/cgi-bin/cvsweb.cgi/~checkout~/gaim" + +SRC_URI = "cvs://anonymous@gaim.cvs.sourceforge.net/cvsroot/gaim;module=gaim \ + ${WEBCVSURL}/no-superimposed-version-on-logo.patch;patch=1 \ + ${WEBCVSURL}/01-optional-icons-in-dialogs.patch;patch=1 \ + ${WEBCVSURL}/02-request-field-dialogs.patch;patch=1 \ + ${WEBCVSURL}/03-blist-dialogs.patch;patch=1 \ + ${WEBCVSURL}/04-saved-status-dialogs.patch;patch=1 \ + ${WEBCVSURL}/05-statusbox-icon-size.patch;patch=1 \ + ${WEBCVSURL}/06-account-dialogs.patch;patch=1 \ + ${WEBCVSURL}/07-roomlist-dialog.patch;patch=1 \ + ${WEBCVSURL}/define-pda-mode.patch;patch=1 \ + ${WEBCVSURL}/desktop-name-2.0.0.patch;patch=1 \ + ${WEBCVSURL}/docklet-icon-size.patch;patch=1 \ + ${WEBCVSURL}/08-prefs-dialog.patch;patch=1 \ + ${WEBCVSURL}/09-filetransfer-dialog.patch;patch=1 \ + ${WEBCVSURL}/10-pda-default-settings.patch;patch=1 \ + file://gaim-OE-branding.patch;patch=1 \ + " + +require gaim.inc + +S = "${WORKDIR}/gaim" + +CFLAGS += "-D_GNU_SOURCE" + + +DEPENDS += "startup-notification" + +#include autopoint (gettext) +EXTRA_AUTORECONF = "" + +#disable "X Session Management"... It is EVIL +EXTRA_OECONF += "--disable-sm --enable-startup-notification \ + --with-gnutls-includes=${STAGING_INCDIR}" + + diff --git a/packages/pidgin/.mtn2git_empty b/packages/pidgin/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/pidgin/pidgin.inc b/packages/pidgin/pidgin.inc new file mode 100644 index 0000000000..a2ef61a508 --- /dev/null +++ b/packages/pidgin/pidgin.inc @@ -0,0 +1,85 @@ +SECTION = "x11/network" +DESCRIPTION = "multi-protocol instant messaging client" +LICENSE = "GPL" + +DEPENDS = "avahi gtk+ ncurses gnutls virtual/libintl gstreamer dbus" +RRECOMMENDS_${PN} = "libpurple-plugin-ssl-gnutls libpurple-protocol-irc libpurple-protocol-xmpp" + +EXTRA_OECONF = " \ + --disable-audio \ + --disable-perl \ + --disable-tcl \ + --disable-deprecated \ + --disable-gevolution \ + --x-includes=${STAGING_INCDIR} \ + --x-libraries=${STAGING_LIBDIR} \ + --enable-gnutls=yes \ + --with-ncurses-headers=${STAGING_INCDIR} \ + --with-gnutls-includes=${STAGING_INCDIR} \ + --with-gnutls-libs=${STAGING_LIBDIR} \ + " + +OE_LT_RPATH_ALLOW=":${libdir}/purple-2:" +OE_LT_RPATH_ALLOW[export]="1" + +PACKAGES =+ "libpurple libpurple-dev libpurple-dbg libpurple-liboscar libpurple-libjabber libpurple-logreader finch finch-dev finch-dbg" + + +LEAD_SONAME = "libpurple.so.0" +FILES_libpurple = "${libdir}/libpurple*.so.* /usr/bin/purple-* /etc/gconf/schemas/purple*" +FILES_libpurple-dev = "${libdir}/libpurple* \ + ${libdir}/purple-2/*.la " +FILES_libpurple-dbg += "${libdir}/.debug/libpurple* \ + ${libdir}/purple-2/.debug" +FILES_libpurple-liboscar = "${libdir}/purple-2/liboscar.so.*" +FILES_libpurple-libjabber = "${libdir}/purple-2/libjabber.so.*" +FILES_libpurple-logreader = "${libdir}/purple-2/log_reader.so" +FILES_finch = "${bindir}/finch /usr/lib/libgnt.so.*" +FILES_finch-dev = "${libdir}/finch/*.la" +FILES_finch-dbg = "${bindir}/.debug/finch \ + ${libdir}/finch/.debug" + +FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \ + ${sysconfdir} ${sharedstatedir} ${localstatedir} \ + /bin /sbin /lib/*.so* ${datadir}/${PN} ${libdir}/${PN}/*.so \ + ${datadir}/pixmaps ${datadir}/applications \ + ${datadir}/idl ${datadir}/omf ${datadir}/sounds \ + ${libdir}/bonobo/servers ${datadir}/icons" +FILES_${PN}-dev += "${libdir}/pidgin/*.la" + +inherit autotools gettext pkgconfig gconf + +PACKAGES_DYNAMIC = "libpurple-protocol-* libpurple-plugin-* pidgin-plugin-* finch-plugin-*" + +python populate_packages_prepend () { + root = bb.data.expand('${libdir}/pidgin', d) + purple = bb.data.expand('${libdir}/purple-2', d) + finch = bb.data.expand('${libdir}/finch', d) + + do_split_packages(d, root, '^([^l][^i][^b].*)\.so$', + output_pattern='pidgin-plugin-%s', + description='Pidgin plugin %s', + prepend=True, extra_depends='') + + do_split_packages(d, purple, '^lib(.*)\.so$', + output_pattern='libpurple-protocol-%s', + description='Libpurple protocol plugin for %s', + prepend=True, extra_depends='') + + do_split_packages(d, purple, '^(ssl-.*)\.so$', + output_pattern='libpurple-plugin-%s', + description='libpurple plugin %s', + prepend=True, extra_depends='libpurple-plugin-ssl') + + do_split_packages(d, purple, '^([^l][^i][^b].*)\.so$', + output_pattern='libpurple-plugin-%s', + description='libpurple plugin %s', + prepend=True, extra_depends='') + + do_split_packages(d, finch, '^([^l][^i][^b].*)\.so$', + output_pattern='finch-plugin-%s', + description='Finch plugin %s', + prepend=True, extra_depends='') + + +} diff --git a/packages/pidgin/pidgin/.mtn2git_empty b/packages/pidgin/pidgin/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/pidgin/pidgin/gconf-no-errors.patch b/packages/pidgin/pidgin/gconf-no-errors.patch new file mode 100644 index 0000000000..9a95175ac9 --- /dev/null +++ b/packages/pidgin/pidgin/gconf-no-errors.patch @@ -0,0 +1,12 @@ +--- /tmp/Makefile.am 2007-05-08 18:39:49.000000000 +0200 ++++ pidgin-2.0.0/libpurple/gconf/Makefile.am 2007-05-08 18:40:13.755251000 +0200 +@@ -8,8 +8,7 @@ + + if GCONF_SCHEMAS_INSTALL + install-data-local: +- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA) 2>&1 | \ +- grep -v "^WARNING: failed to install schema" | grep -v "^Attached schema" 1>&2 ++ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA) 2>&1 + else + install-data-local: + endif diff --git a/packages/pidgin/pidgin/pidgin.desktop-set-icon.patch b/packages/pidgin/pidgin/pidgin.desktop-set-icon.patch new file mode 100644 index 0000000000..05f76895ba --- /dev/null +++ b/packages/pidgin/pidgin/pidgin.desktop-set-icon.patch @@ -0,0 +1,11 @@ +--- pidgin-2.0.1/pidgin.desktop.in.orig 2007-06-20 23:50:44.000000000 +0000 ++++ pidgin-2.0.1/pidgin.desktop.in 2007-06-20 23:51:05.000000000 +0000 +@@ -4,7 +4,7 @@ + _GenericName=Internet Messenger + _Comment=Send instant messages over multiple protocols + Exec=pidgin +-Icon=pidgin ++Icon=/usr/share/icons/hicolor/48x48/apps/pidgin.png + StartupNotify=true + Terminal=false + Type=Application diff --git a/packages/pidgin/pidgin/purple-OE-branding.patch b/packages/pidgin/pidgin/purple-OE-branding.patch new file mode 100644 index 0000000000..99c61375ce --- /dev/null +++ b/packages/pidgin/pidgin/purple-OE-branding.patch @@ -0,0 +1,14 @@ +--- /tmp/irc.h 2007-08-04 20:27:10.000000000 +0200 ++++ pidgin-2.1.0/libpurple/protocols/irc/irc.h 2007-08-04 20:28:15.318400000 +0200 +@@ -35,9 +35,9 @@ + #define IRC_DEFAULT_SSL_PORT 994 + + #define IRC_DEFAULT_CHARSET "UTF-8" +-#define IRC_DEFAULT_ALIAS "purple" ++#define IRC_DEFAULT_ALIAS "OE-user" + +-#define IRC_DEFAULT_QUIT "Leaving." ++#define IRC_DEFAULT_QUIT "Powered by OE: www.openembedded.org" + + #define IRC_INITIAL_BUFSIZE 1024 + diff --git a/packages/pidgin/pidgin/sanitize-configure.ac.patch b/packages/pidgin/pidgin/sanitize-configure.ac.patch new file mode 100644 index 0000000000..a77d64f40b --- /dev/null +++ b/packages/pidgin/pidgin/sanitize-configure.ac.patch @@ -0,0 +1,33 @@ +--- /tmp/configure.ac 2007-05-08 17:29:02.000000000 +0200 ++++ pidgin-2.0.0/configure.ac 2007-05-08 17:30:30.325251000 +0200 +@@ -472,7 +472,7 @@ + if test "x$enable_consoleui" = "xyes"; then + dnl # Some distros put the headers in ncursesw/, some don't + found_ncurses_h=no +- for location in $ac_ncurses_includes $NCURSES_HEADERS /usr/include/ncursesw /usr/include ++ for location in $ac_ncurses_includes $NCURSES_HEADERS + do + f="$location/ncurses.h" + AC_CHECK_HEADER($f,[ +@@ -1860,10 +1860,6 @@ + KRB4_CFLAGS="$KRB4_CFLAGS -I${kerberos}/include/kerberosIV" + fi + KRB4_LDFLAGS="-L${kerberos}/lib" +- elif test -d /usr/local/include/kerberosIV ; then +- KRB4_CFLAGS="-I/usr/local/include/kerberosIV" +- elif test -d /usr/include/kerberosIV ; then +- KRB4_CFLAGS="-I/usr/include/kerberosIV" + fi + AC_DEFINE(ZEPHYR_USES_KERBEROS, 1, [Define if kerberos should be used in Zephyr.]) + +@@ -1896,10 +1892,6 @@ + ZEPHYR_LDFLAGS="-L${zephyr}/lib" + elif test -d /usr/athena/include/zephyr ; then + ZEPHYR_CFLAGS="-I/usr/athena/include" +- elif test -d /usr/include/zephyr ; then +- ZEPHYR_CFLAGS="-I/usr/include" +- elif test -d /usr/local/include/zephyr ; then +- ZEPHYR_CFLAGS="-I/usr/local/include" + fi + AC_DEFINE(LIBZEPHYR_EXT, 1 , [Define if external libzephyr should be used.]) + AM_CONDITIONAL(EXTERNAL_LIBZEPHYR, test "x$zephyr" != "xno") diff --git a/packages/pidgin/pidgin_2.0.2.bb b/packages/pidgin/pidgin_2.0.2.bb new file mode 100644 index 0000000000..2cc02c5072 --- /dev/null +++ b/packages/pidgin/pidgin_2.0.2.bb @@ -0,0 +1,9 @@ +require pidgin.inc + +SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \ + file://sanitize-configure.ac.patch;patch=1 \ + file://gconf-no-errors.patch;patch=1 \ + file://pidgin.desktop-set-icon.patch;patch=1 \ + " + +PR = "r1" diff --git a/packages/pidgin/pidgin_2.1.1.bb b/packages/pidgin/pidgin_2.1.1.bb new file mode 100644 index 0000000000..5531880669 --- /dev/null +++ b/packages/pidgin/pidgin_2.1.1.bb @@ -0,0 +1,10 @@ +require pidgin.inc + +SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \ + file://sanitize-configure.ac.patch;patch=1 \ + file://gconf-no-errors.patch;patch=1 \ + file://pidgin.desktop-set-icon.patch;patch=1 \ + file://purple-OE-branding.patch;patch=1 \ + " + +PR = "r0" diff --git a/packages/pidgin/pidgin_2.2.1.bb b/packages/pidgin/pidgin_2.2.1.bb new file mode 100644 index 0000000000..5531880669 --- /dev/null +++ b/packages/pidgin/pidgin_2.2.1.bb @@ -0,0 +1,10 @@ +require pidgin.inc + +SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \ + file://sanitize-configure.ac.patch;patch=1 \ + file://gconf-no-errors.patch;patch=1 \ + file://pidgin.desktop-set-icon.patch;patch=1 \ + file://purple-OE-branding.patch;patch=1 \ + " + +PR = "r0" -- cgit v1.2.3 From 1bd9cd965d8cbef3eeb9527284e246d2a526d41d Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Wed, 20 Feb 2008 01:27:34 +0000 Subject: angstrom-2008-preferred-versions.inc: bump libtool to 1.5.10. version 1.2.14 no longer exist. --- conf/distro/include/angstrom-2008-preferred-versions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index 5641c8ee39..b8685a578e 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -1,7 +1,7 @@ PREFERRED_VERSION_dbus = "1.1.4" PREFERRED_VERSION_busybox = "1.9.1" PREFERRED_VERSION_gst-pulse = "0.9.7" -PREFERRED_VERSION_libtool = "1.2.14" +PREFERRED_VERSION_libtool = "1.5.10" PREFERRED_VERSION_pulseaudio = "0.9.9" PREFERRED_VERSION_udev = "118" PREFERRED_VERSION_vte = "0.16.10" -- cgit v1.2.3