Sync more files with OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@271 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
parent
dd1b4430b5
commit
42dfbb2a02
|
|
@ -0,0 +1,72 @@
|
|||
DISTRO = "familiar"
|
||||
DISTRO_NAME = "Familiar Linux"
|
||||
DISTRO_VERSION = "unstable-${DATE}"
|
||||
MAINTAINER = "Koen Kooi <koen@handhelds.org>"
|
||||
# Do not touch this file before notifying familiar-dev@handhelds.org
|
||||
|
||||
include conf/distro/familiar.conf
|
||||
|
||||
|
||||
DISTRO_TYPE = "debug"
|
||||
#DISTRO_TYPE = "release"
|
||||
#!!!!! DON'T FORGET TO ENABLE ZAPROOTPASSWD !!!!!
|
||||
|
||||
|
||||
FEED_URIS += " \
|
||||
base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \
|
||||
updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates"
|
||||
|
||||
#SRCDATE = 20050331
|
||||
#SRCDATE = "now"
|
||||
|
||||
PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
|
||||
PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
|
||||
PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
|
||||
|
||||
PREFERRED_PROVIDER_virtual/libiconv=glibc
|
||||
PREFERRED_PROVIDER_virtual/libintl=glibc
|
||||
PREFERRED_PROVIDER_x11=diet-x11
|
||||
|
||||
PREFERRED_VERSION_hostap-modules ?= "0.3.9"
|
||||
|
||||
#2.4 machines prefer 0.13e ones
|
||||
PREFERRED_VERSION_orinoco-modules ?= "0.13e"
|
||||
|
||||
#but 0.13e doesn't build against 2.6
|
||||
PREFERRED_VERSION_orinoco-modules_h2200 ?= "0.15"
|
||||
PREFERRED_VERSION_orinoco-modules_ipaq-pxa270 ?= "0.15"
|
||||
|
||||
|
||||
|
||||
# The CSL compiler is unusable because
|
||||
# 1) certain programs stop to compile
|
||||
# 2) more programs segfault
|
||||
PREFERRED_VERSION_gcc ?= "3.4.4"
|
||||
PREFERRED_VERSION_gcc-cross ?= "3.4.4"
|
||||
PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
|
||||
|
||||
#
|
||||
# Opie
|
||||
#
|
||||
|
||||
PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie"
|
||||
PREFERRED_VERSION_qte = "2.3.10"
|
||||
|
||||
#OPIE_VERSION = "1.2.1"
|
||||
#include conf/distro/preferred-opie-versions.inc
|
||||
|
||||
#
|
||||
# GPE
|
||||
#
|
||||
|
||||
PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
|
||||
PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
|
||||
PREFERRED_PROVIDER_x11 = "diet-x11"
|
||||
|
||||
include conf/distro/preferred-gpe-versions-2.8.inc
|
||||
|
||||
#
|
||||
# E
|
||||
#
|
||||
include conf/distro/preferred-e-versions.inc
|
||||
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
#@TYPE: Distribution
|
||||
#@NAME: Familiar Linux
|
||||
#@DESCRIPTION: Distribution configuration for Familiar Linux (handhelds.org)
|
||||
|
||||
INHERIT += "package_ipk debian"
|
||||
TARGET_OS = "linux"
|
||||
|
||||
PARALLEL_INSTALL_MODULES = "1"
|
||||
UDEV_DEVFS_RULES = "1"
|
||||
IMAGE_NAME = "${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}"
|
||||
|
||||
BOOTSTRAP_EXTRA_RDEPENDS += "familiar-version"
|
||||
|
||||
DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}"
|
||||
|
||||
include conf/distro/include/multimachine.conf
|
||||
|
|
@ -0,0 +1,67 @@
|
|||
DISTRO_VERSION = ".dev-snapshot-${DATE}"
|
||||
|
||||
include conf/distro/openzaurus.conf
|
||||
|
||||
DISTRO_TYPE = "debug"
|
||||
# DISTRO_TYPE = "release"
|
||||
|
||||
#FEED_URIS += " \
|
||||
# upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \
|
||||
#upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \
|
||||
# machine##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/machine/${MACHINE} \
|
||||
# base##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/base/ \
|
||||
# libs##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/libs/ \
|
||||
# console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \
|
||||
# devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel"
|
||||
|
||||
# SRCDATE = "20050704"
|
||||
|
||||
#
|
||||
# Zaurus
|
||||
#
|
||||
|
||||
ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95"
|
||||
|
||||
KERNEL_CONSOLE = "ttyS0"
|
||||
#DEBUG_OPTIMIZATION = "-O -g3"
|
||||
#DEBUG_BUILD = "1"
|
||||
#INHIBIT_PACKAGE_STRIP = "1"
|
||||
|
||||
PREFERRED_VERSION_gcc-cross ?= "3.4.4"
|
||||
PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
|
||||
|
||||
PREFERRED_VERSION_hostap-modules ?= "0.3.9"
|
||||
|
||||
#fix some iconv issues, needs to be adjusted when doing uclibc builds
|
||||
PREFERRED_PROVIDER_virtual/libiconv = "glibc"
|
||||
PREFERRED_PROVIDER_virtual/libintl = "glibc"
|
||||
|
||||
|
||||
#
|
||||
# Base
|
||||
#
|
||||
PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1"
|
||||
PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
|
||||
PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
|
||||
PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
|
||||
|
||||
#
|
||||
# Opie
|
||||
#
|
||||
PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie"
|
||||
|
||||
#OPIE_VERSION = "1.2.1"
|
||||
#include conf/distro/preferred-opie-versions.inc
|
||||
|
||||
#
|
||||
# GPE
|
||||
#
|
||||
PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
|
||||
PREFERRED_PROVIDER_x11 = "diet-x11"
|
||||
include conf/distro/preferred-gpe-versions-2.8.inc
|
||||
|
||||
#
|
||||
# E
|
||||
#
|
||||
include conf/distro/preferred-e-versions.inc
|
||||
|
||||
|
|
@ -73,44 +73,44 @@ PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus
|
|||
#
|
||||
# CVS Dates to use:
|
||||
#
|
||||
#CVSDATE_gnome-vfs-dbus = "20051215"
|
||||
CVSDATE_gconf-dbus = "20060119"
|
||||
CVSDATE_gnome-vfs-dbus = "20060119"
|
||||
CVSDATE_contacts = "20060207"
|
||||
CVSDATE_dates = "20060120"
|
||||
CVSDATE_eds-dbus = "20060126"
|
||||
CVSDATE_minimo = "20050401"
|
||||
CVSDATE_ipkg-utils-native = "20050930"
|
||||
CVSDATE_ipkg-link-1 = "20050930"
|
||||
CVSDATE_ipkg-utils = "20050930"
|
||||
CVSDATE_ipkg-link = "20050930"
|
||||
CVSDATE_matchbox-common = "20051101"
|
||||
CVSDATE_matchbox-config-gtk = "20051101"
|
||||
CVSDATE_matchbox-desktop = "20060120"
|
||||
CVSDATE_matchbox-keyboard = "20051101"
|
||||
CVSDATE_matchbox-panel = "20051101"
|
||||
CVSDATE_matchbox-panel-manager = "20051101"
|
||||
CVSDATE_matchbox-stroke = "20051101"
|
||||
CVSDATE_matchbox-themes-extra = "20051101"
|
||||
CVSDATE_matchbox-wm = "20060120"
|
||||
CVSDATE_libmatchbox = "20060120"
|
||||
CVSDATE_tslib = "20051101"
|
||||
CVSDATE_xext = "20051101"
|
||||
CVSDATE_renderext = "20051101"
|
||||
CVSDATE_libxrender = "20051101"
|
||||
CVSDATE_fixesext = "20051101"
|
||||
CVSDATE_damageext = "20051101"
|
||||
CVSDATE_compositeext = "20051101"
|
||||
CVSDATE_xcalibrateext = "20051101"
|
||||
CVSDATE_recordext = "20051101"
|
||||
CVSDATE_libfakekey = "20051101"
|
||||
CVSDATE_xmodmap = "20051101"
|
||||
CVSDATE_xrandr = "20051101"
|
||||
CVSDATE_xtst = "20051101"
|
||||
CVSDATE_xcalibrate = "20051101"
|
||||
CVSDATE_xmu = "20051115"
|
||||
CVSDATE_xdpyinfo = "20051115"
|
||||
CVSDATE_xauth = "20060120"
|
||||
#SRCDATE_gnome-vfs-dbus = "20051215"
|
||||
SRCDATE_gconf-dbus = "20060119"
|
||||
SRCDATE_gnome-vfs-dbus = "20060119"
|
||||
SRCDATE_contacts = "20060207"
|
||||
SRCDATE_dates = "20060120"
|
||||
SRCDATE_eds-dbus = "20060126"
|
||||
SRCDATE_minimo = "20050401"
|
||||
SRCDATE_ipkg-utils-native = "20050930"
|
||||
SRCDATE_ipkg-link-1 = "20050930"
|
||||
SRCDATE_ipkg-utils = "20050930"
|
||||
SRCDATE_ipkg-link = "20050930"
|
||||
SRCDATE_matchbox-common = "20051101"
|
||||
SRCDATE_matchbox-config-gtk = "20051101"
|
||||
SRCDATE_matchbox-desktop = "20060120"
|
||||
SRCDATE_matchbox-keyboard = "20051101"
|
||||
SRCDATE_matchbox-panel = "20051101"
|
||||
SRCDATE_matchbox-panel-manager = "20051101"
|
||||
SRCDATE_matchbox-stroke = "20051101"
|
||||
SRCDATE_matchbox-themes-extra = "20051101"
|
||||
SRCDATE_matchbox-wm = "20060120"
|
||||
SRCDATE_libmatchbox = "20060120"
|
||||
SRCDATE_tslib = "20051101"
|
||||
SRCDATE_xext = "20051101"
|
||||
SRCDATE_renderext = "20051101"
|
||||
SRCDATE_libxrender = "20051101"
|
||||
SRCDATE_fixesext = "20051101"
|
||||
SRCDATE_damageext = "20051101"
|
||||
SRCDATE_compositeext = "20051101"
|
||||
SRCDATE_xcalibrateext = "20051101"
|
||||
SRCDATE_recordext = "20051101"
|
||||
SRCDATE_libfakekey = "20051101"
|
||||
SRCDATE_xmodmap = "20051101"
|
||||
SRCDATE_xrandr = "20051101"
|
||||
SRCDATE_xtst = "20051101"
|
||||
SRCDATE_xcalibrate = "20051101"
|
||||
SRCDATE_xmu = "20051115"
|
||||
SRCDATE_xdpyinfo = "20051115"
|
||||
SRCDATE_xauth = "20060120"
|
||||
|
||||
#
|
||||
# Preferred Versions:
|
||||
|
|
@ -118,15 +118,15 @@ CVSDATE_xauth = "20060120"
|
|||
PREFERRED_VERSION_matchbox = "0.9.1"
|
||||
PREFERRED_VERSION_matchbox-applet-inputmanager = "0.6"
|
||||
PREFERRED_VERSION_matchbox-applet-startup-monitor = "0.1"
|
||||
PREFERRED_VERSION_matchbox-common = "0.9.1+cvs-${CVSDATE}"
|
||||
PREFERRED_VERSION_matchbox-config-gtk = "0.0+cvs-${CVSDATE}"
|
||||
PREFERRED_VERSION_matchbox-desktop = "0.9.1+cvs-${CVSDATE}"
|
||||
PREFERRED_VERSION_matchbox-keyboard = "0.0+cvs-${CVSDATE}"
|
||||
PREFERRED_VERSION_matchbox-panel = "0.9.2+cvs-${CVSDATE}"
|
||||
PREFERRED_VERSION_matchbox-stroke = "0.0+cvs-${CVSDATE}"
|
||||
PREFERRED_VERSION_matchbox-themes-extra = "0.3+cvs-${CVSDATE}"
|
||||
PREFERRED_VERSION_matchbox-wm = "0.9.5+cvs-${CVSDATE}"
|
||||
PREFERRED_VERSION_libmatchbox = "1.7+cvs-${CVSDATE}"
|
||||
PREFERRED_VERSION_matchbox-common = "0.9.1+svn${SRCDATE}"
|
||||
PREFERRED_VERSION_matchbox-config-gtk = "0.0+svn${SRCDATE}"
|
||||
PREFERRED_VERSION_matchbox-desktop = "0.9.1+svn${SRCDATE}"
|
||||
PREFERRED_VERSION_matchbox-keyboard = "0.0+svn${SRCDATE}"
|
||||
PREFERRED_VERSION_matchbox-panel = "0.9.2+svn${SRCDATE}"
|
||||
PREFERRED_VERSION_matchbox-stroke = "0.0+svn${SRCDATE}"
|
||||
PREFERRED_VERSION_matchbox-themes-extra = "0.3+svn${SRCDATE}"
|
||||
PREFERRED_VERSION_matchbox-wm = "0.9.5+svn${SRCDATE}"
|
||||
PREFERRED_VERSION_libmatchbox = "1.7+svn${SRCDATE}"
|
||||
|
||||
#PREFERRED_VERSION_atk = "1.10.0"
|
||||
#PREFERRED_VERSION_cairo = "1.0.0"
|
||||
|
|
@ -155,18 +155,18 @@ PREFERRED_VERSION_libschedule ?= "0.15"
|
|||
PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1"
|
||||
PREFERRED_VERSION_linphone ?= "0.12.2"
|
||||
PREFERRED_VERSION_minilite ?= "0.49"
|
||||
PREFERRED_VERSION_minimo ?= "0.0cvs${CVSDATE_minimo}"
|
||||
PREFERRED_VERSION_minimo ?= "0.0+cvs${SRCDATE_minimo}"
|
||||
PREFERRED_VERSION_poppler ?= "0.3.3"
|
||||
PREFERRED_VERSION_rosetta ?= "0.0cvs${CVSDATE}"
|
||||
PREFERRED_VERSION_rosetta ?= "0.0+cvs${SRCDATE}"
|
||||
PREFERRED_VERSION_rxvt-unicode ?= "5.6"
|
||||
PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1"
|
||||
PREFERRED_VERSION_xdemineur ?= "2.1.1"
|
||||
PREFERRED_VERSION_xextensions ?= "1.0.1"
|
||||
PREFERRED_VERSION_xhost ?= "0.0cvs20040413"
|
||||
PREFERRED_VERSION_xhost ?= "0.0+cvs20040413"
|
||||
PREFERRED_VERSION_xmonobut ?= "0.4"
|
||||
PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}"
|
||||
PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}"
|
||||
PREFERRED_VERSION_xproto ?= "6.6.2"
|
||||
PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}"
|
||||
PREFERRED_VERSION_xrdb ?= "0.0+cvs${SRCDATE}"
|
||||
PREFERRED_VERSION_xst ?= "0.15"
|
||||
|
||||
PREFERRED_VERSION_oprofile ?= "0.0cvs${CVSDATE}"
|
||||
PREFERRED_VERSION_oprofile ?= "0.0+cvs${SRCDATE}"
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#
|
||||
|
||||
#work around some breakages
|
||||
#CVSDATE_minimo=20050401
|
||||
#SRCDATE_minimo=20050401
|
||||
|
||||
#set some preferred providers:
|
||||
PREFERRED_PROVIDER_gconf=gconf-dbus
|
||||
|
|
@ -14,7 +14,7 @@ PREFERRED_VERSION_libmatchbox ?= "1.7"
|
|||
PREFERRED_VERSION_matchbox ?= "0.9.1"
|
||||
PREFERRED_VERSION_matchbox-common ?= "0.9.1"
|
||||
PREFERRED_VERSION_matchbox-desktop ?= "0.9.1"
|
||||
PREFERRED_VERSION_matchbox-wm ?= "0.9.5+cvs-${CVSDATE}"
|
||||
PREFERRED_VERSION_matchbox-wm ?= "0.9.5+svn${SRCDATE}"
|
||||
PREFERRED_VERSION_matchbox-panel ?= "0.9.2"
|
||||
PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
|
||||
PREFERRED_VERSION_atk ?= "1.9.0"
|
||||
|
|
@ -36,10 +36,10 @@ PREFERRED_VERSION_rxvt-unicode ?= "5.6"
|
|||
PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3"
|
||||
PREFERRED_VERSION_xst ?= "0.15"
|
||||
PREFERRED_VERSION_xextensions ?= "1.0.1"
|
||||
PREFERRED_VERSION_xserver-kdrive = "0.0cvs20050207"
|
||||
PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}"
|
||||
PREFERRED_VERSION_xhost ?= "0.0cvs20040413"
|
||||
PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}"
|
||||
PREFERRED_VERSION_xserver-kdrive = "0.0+cvs20050207"
|
||||
PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}"
|
||||
PREFERRED_VERSION_xhost ?= "0.0+cvs20040413"
|
||||
PREFERRED_VERSION_xrdb ?= "0.0+cvs${SRCDATE}"
|
||||
PREFERRED_VERSION_gpe-login ?= "0.83"
|
||||
PREFERRED_VERSION_gpe-session-scripts ?= "0.66"
|
||||
PREFERRED_VERSION_gpe-soundserver ?= "0.4-1"
|
||||
|
|
@ -82,9 +82,9 @@ PREFERRED_VERSION_gpe-tetris ?= "0.6-4"
|
|||
PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6"
|
||||
PREFERRED_VERSION_xdemineur ?= "2.1.1"
|
||||
PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1"
|
||||
PREFERRED_VERSION_rosetta ?= "0.0cvs${CVSDATE}"
|
||||
PREFERRED_VERSION_rosetta ?= "0.0+cvs${SRCDATE}"
|
||||
PREFERRED_VERSION_dillo2 ?= "0.6.6"
|
||||
PREFERRED_VERSION_minimo ?= "0.0cvs${CVSDATE_minimo}"
|
||||
PREFERRED_VERSION_minimo ?= "0.0+cvs${SRCDATE_minimo}"
|
||||
PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1"
|
||||
PREFERRED_VERSION_linphone ?= "0.12.2"
|
||||
PREFERRED_VERSION_firefox ?= "1.0"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,50 @@
|
|||
Index: apmd-3.2.2.orig/apm.c
|
||||
===================================================================
|
||||
--- apmd-3.2.2.orig.orig/apm.c 2006-01-26 15:15:27.000000000 +0100
|
||||
+++ apmd-3.2.2.orig/apm.c 2006-01-26 17:50:14.000000000 +0100
|
||||
@@ -24,10 +24,12 @@
|
||||
#include <unistd.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
+#include <sys/utsname.h>
|
||||
#include <fcntl.h>
|
||||
#include <errno.h>
|
||||
#include <time.h>
|
||||
#include <getopt.h>
|
||||
+#include <signal.h>
|
||||
#include "apm.h"
|
||||
|
||||
static int verbose = 0;
|
||||
@@ -43,6 +45,9 @@
|
||||
int fd;
|
||||
time_t then, now;
|
||||
int error;
|
||||
+ FILE* pid_file;
|
||||
+ int apmd_pid;
|
||||
+ struct utsname uname_ver;
|
||||
|
||||
fd = open(APM_DEVICE, O_WRONLY);
|
||||
if (fd < 0)
|
||||
@@ -54,6 +59,22 @@
|
||||
switch (mode)
|
||||
{
|
||||
case SUSPEND:
|
||||
+ if(0 == system("grep -i hardware /proc/cpuinfo|grep -i SHARP"))
|
||||
+ {
|
||||
+ uname(&uname_ver);
|
||||
+
|
||||
+ if(0 == strncmp("2.4", uname_ver.release, 3))
|
||||
+ {
|
||||
+ pid_file = fopen("/var/run/apmd.pid", "r");
|
||||
+ if(pid_file)
|
||||
+ {
|
||||
+ fscanf(pid_file, "%d", &apmd_pid);
|
||||
+ fclose(pid_file);
|
||||
+ }
|
||||
+
|
||||
+ kill(apmd_pid, SIGKILL);
|
||||
+ }
|
||||
+ }
|
||||
error = apm_suspend(fd);
|
||||
break;
|
||||
case STANDBY:
|
||||
|
|
@ -95,6 +95,8 @@ mv ${TMP_LOCALE}/locale-archive ${libdir}/locale/
|
|||
rm -rf ${TMP_LOCALE}
|
||||
}
|
||||
|
||||
PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-*"
|
||||
|
||||
python package_do_split_gconvs () {
|
||||
import os, re
|
||||
if (bb.data.getVar('PACKAGE_NO_GCONV', d, 1) == '1'):
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ do_install() {
|
|||
oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install
|
||||
}
|
||||
|
||||
PACKAGES_DYNAMIC = "gnome=vfs-plugin-*"
|
||||
PACKAGES_DYNAMIC = "gnome-vfs-plugin-*"
|
||||
|
||||
python populate_packages_prepend () {
|
||||
print bb.data.getVar('FILES_gnome-vfs', d, 1)
|
||||
|
|
|
|||
|
|
@ -1,63 +0,0 @@
|
|||
Definitely Keep
|
||||
===
|
||||
|
||||
disable-tooltips.patch
|
||||
|
||||
Makes sense for toucscreens at least. Could be made better by being
|
||||
an XSettings property: http://bugzilla.gnome.org/show_bug.cgi?id=315112
|
||||
|
||||
hardcoded_libtool.patch
|
||||
|
||||
Fix libtool calls in configure - likely needed although should go upstream in
|
||||
some form if possible.
|
||||
|
||||
|
||||
Probably Uneeded
|
||||
===
|
||||
|
||||
no-xwc.patch
|
||||
|
||||
Removes any (uneeded) i18n xlib calls that are just stubs in an xlib built
|
||||
with --disable-locale. Might not be needed as Xlib should provide stubs.
|
||||
|
||||
gtklabel-resize-patch
|
||||
|
||||
Forces a resize when the style is set. Shouldn't be needed as the
|
||||
clear_layout() call should do what is required. Remove and see?
|
||||
|
||||
no-demos.patch
|
||||
|
||||
Do we want demos to be built? RB: does it matter if they are built, can we
|
||||
just not install gtk-demo?
|
||||
|
||||
scroll-timings.patch
|
||||
|
||||
Slows down the delays when clicking on scrollbars.
|
||||
|
||||
single-click.patch
|
||||
|
||||
Makes the (deprecated) GtkFileSelector use single-click rather than double.
|
||||
|
||||
gtk+-handhelds.patch
|
||||
|
||||
Crack insane patch which changes the size of arrows, fiddles how the calendar
|
||||
works, adds a min-width style property on GtkEntry, and adds support for the
|
||||
RECOGNISE_PROTOCOLS atom.
|
||||
|
||||
|
||||
Not Sure
|
||||
===
|
||||
|
||||
Not sure what this appears to do or how they affect things too be useful;
|
||||
|
||||
menu-deactivate.patch
|
||||
spinbutton.patch
|
||||
|
||||
automake-lossage.patch
|
||||
|
||||
|
||||
Can Definitely Go
|
||||
===
|
||||
|
||||
small-gtkfilesel.patch - CRACK!
|
||||
xsettings.patch - EVEEL!
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
--- gtk+-2.4.1/docs/tutorial/Makefile.am~ 2003-05-06 22:54:20.000000000 +0100
|
||||
+++ gtk+-2.4.1/docs/tutorial/Makefile.am 2004-05-08 12:31:41.000000000 +0100
|
||||
@@ -52,21 +52,5 @@
|
||||
|
||||
dist-hook: html
|
||||
cp -Rp $(srcdir)/html $(distdir)
|
||||
-else
|
||||
-html:
|
||||
- echo "***"
|
||||
- echo "*** Warning: Tutorial not built"
|
||||
- echo "***"
|
||||
-
|
||||
-pdf:
|
||||
- echo "***"
|
||||
- echo "*** Warning: Tutorial not built"
|
||||
- echo "***"
|
||||
-
|
||||
-dist-hook:
|
||||
- echo "***"
|
||||
- echo "*** Warning: Tutorial not built"
|
||||
- echo "*** DISTRIBUTION IS INCOMPLETE"
|
||||
- echo "***"
|
||||
endif
|
||||
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- gtk+-2.4.3/gtk/gtktooltips.c.old 2004-07-04 18:52:04.000000000 +0100
|
||||
+++ gtk+-2.4.3/gtk/gtktooltips.c 2004-07-04 18:52:08.000000000 +0100
|
||||
@@ -118,7 +118,7 @@
|
||||
tooltips->tips_data_list = NULL;
|
||||
|
||||
tooltips->delay = DEFAULT_DELAY;
|
||||
- tooltips->enabled = TRUE;
|
||||
+ tooltips->enabled = FALSE;
|
||||
tooltips->timer_tag = 0;
|
||||
tooltips->use_sticky_delay = FALSE;
|
||||
tooltips->last_popdown.tv_sec = -1;
|
||||
|
|
@ -1,236 +0,0 @@
|
|||
--- gtk+-2.4.1/gtk/gtkarrow.c 2004-03-13 09:51:13.000000000 +1100
|
||||
+++ gtk+-2.4.1/gtk/gtkarrow.c 2004-05-26 14:52:17.000000000 +1000
|
||||
@@ -29,7 +29,7 @@
|
||||
#include "gtkarrow.h"
|
||||
#include "gtkintl.h"
|
||||
|
||||
-#define MIN_ARROW_SIZE 15
|
||||
+#define MIN_ARROW_SIZE 7
|
||||
|
||||
enum {
|
||||
PROP_0,
|
||||
@@ -53,6 +53,8 @@
|
||||
guint prop_id,
|
||||
GValue *value,
|
||||
GParamSpec *pspec);
|
||||
+static void gtk_arrow_size_request (GtkWidget *arrow,
|
||||
+ GtkRequisition *requisition);
|
||||
|
||||
GType
|
||||
gtk_arrow_get_type (void)
|
||||
@@ -111,6 +113,7 @@
|
||||
G_PARAM_READABLE | G_PARAM_WRITABLE));
|
||||
|
||||
widget_class->expose_event = gtk_arrow_expose;
|
||||
+ widget_class->size_request = gtk_arrow_size_request;
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -166,13 +169,18 @@
|
||||
}
|
||||
|
||||
static void
|
||||
+gtk_arrow_size_request (GtkWidget *arrow,
|
||||
+ GtkRequisition *requisition)
|
||||
+{
|
||||
+ requisition->width = MIN_ARROW_SIZE + GTK_MISC (arrow)->xpad * 2;
|
||||
+ requisition->height = MIN_ARROW_SIZE + GTK_MISC (arrow)->ypad * 2;
|
||||
+}
|
||||
+
|
||||
+static void
|
||||
gtk_arrow_init (GtkArrow *arrow)
|
||||
{
|
||||
GTK_WIDGET_SET_FLAGS (arrow, GTK_NO_WINDOW);
|
||||
|
||||
- GTK_WIDGET (arrow)->requisition.width = MIN_ARROW_SIZE + GTK_MISC (arrow)->xpad * 2;
|
||||
- GTK_WIDGET (arrow)->requisition.height = MIN_ARROW_SIZE + GTK_MISC (arrow)->ypad * 2;
|
||||
-
|
||||
arrow->arrow_type = GTK_ARROW_RIGHT;
|
||||
arrow->shadow_type = GTK_SHADOW_OUT;
|
||||
}
|
||||
--- gtk+-2.4.1/gtk/gtkcalendar.c 2004-03-06 14:37:26.000000000 +1100
|
||||
+++ gtk+-2.4.1/gtk/gtkcalendar.c 2004-05-26 14:58:57.000000000 +1000
|
||||
@@ -340,6 +340,9 @@
|
||||
static void gtk_calendar_select_and_focus_day (GtkCalendar *calendar,
|
||||
guint day);
|
||||
|
||||
+static void gtk_calendar_do_select_day (GtkCalendar *calendar,
|
||||
+ guint day);
|
||||
+
|
||||
static void gtk_calendar_paint_arrow (GtkWidget *widget,
|
||||
guint arrow);
|
||||
static void gtk_calendar_paint_day_num (GtkWidget *widget,
|
||||
@@ -861,13 +864,13 @@
|
||||
if (month_len < calendar->selected_day)
|
||||
{
|
||||
calendar->selected_day = 0;
|
||||
- gtk_calendar_select_day (calendar, month_len);
|
||||
+ gtk_calendar_do_select_day (calendar, month_len);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (calendar->selected_day < 0)
|
||||
calendar->selected_day = calendar->selected_day + 1 + month_length[leap (calendar->year)][calendar->month + 1];
|
||||
- gtk_calendar_select_day (calendar, calendar->selected_day);
|
||||
+ gtk_calendar_do_select_day (calendar, calendar->selected_day);
|
||||
}
|
||||
|
||||
gtk_widget_queue_draw (GTK_WIDGET (calendar));
|
||||
@@ -908,10 +911,10 @@
|
||||
if (month_len < calendar->selected_day)
|
||||
{
|
||||
calendar->selected_day = 0;
|
||||
- gtk_calendar_select_day (calendar, month_len);
|
||||
+ gtk_calendar_do_select_day (calendar, month_len);
|
||||
}
|
||||
else
|
||||
- gtk_calendar_select_day (calendar, calendar->selected_day);
|
||||
+ gtk_calendar_do_select_day (calendar, calendar->selected_day);
|
||||
|
||||
gtk_widget_queue_draw (GTK_WIDGET (calendar));
|
||||
gtk_calendar_thaw (calendar);
|
||||
@@ -939,10 +942,10 @@
|
||||
if (month_len < calendar->selected_day)
|
||||
{
|
||||
calendar->selected_day = 0;
|
||||
- gtk_calendar_select_day (calendar, month_len);
|
||||
+ gtk_calendar_do_select_day (calendar, month_len);
|
||||
}
|
||||
else
|
||||
- gtk_calendar_select_day (calendar, calendar->selected_day);
|
||||
+ gtk_calendar_do_select_day (calendar, calendar->selected_day);
|
||||
|
||||
gtk_widget_queue_draw (GTK_WIDGET (calendar));
|
||||
gtk_calendar_thaw (calendar);
|
||||
@@ -974,10 +977,10 @@
|
||||
if (month_len < calendar->selected_day)
|
||||
{
|
||||
calendar->selected_day = 0;
|
||||
- gtk_calendar_select_day (calendar, month_len);
|
||||
+ gtk_calendar_do_select_day (calendar, month_len);
|
||||
}
|
||||
else
|
||||
- gtk_calendar_select_day (calendar, calendar->selected_day);
|
||||
+ gtk_calendar_do_select_day (calendar, calendar->selected_day);
|
||||
|
||||
gtk_widget_queue_draw (GTK_WIDGET (calendar));
|
||||
gtk_calendar_thaw (calendar);
|
||||
@@ -2480,9 +2483,9 @@
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
-void
|
||||
-gtk_calendar_select_day (GtkCalendar *calendar,
|
||||
- guint day)
|
||||
+static void
|
||||
+gtk_calendar_do_select_day (GtkCalendar *calendar,
|
||||
+ guint day)
|
||||
{
|
||||
g_return_if_fail (GTK_IS_CALENDAR (calendar));
|
||||
g_return_if_fail (day <= 31);
|
||||
@@ -2499,6 +2502,13 @@
|
||||
if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (calendar)))
|
||||
gtk_calendar_paint_day_num (GTK_WIDGET (calendar), selected_day);
|
||||
}
|
||||
+}
|
||||
+
|
||||
+void
|
||||
+gtk_calendar_select_day (GtkCalendar *calendar,
|
||||
+ guint day)
|
||||
+{
|
||||
+ gtk_calendar_do_select_day (calendar, day);
|
||||
|
||||
calendar->selected_day = day;
|
||||
|
||||
--- gtk+-2.4.1/gtk/gtkentry.c 2004-04-22 08:08:08.000000000 +1000
|
||||
+++ gtk+-2.4.1/gtk/gtkentry.c 2004-05-26 14:52:17.000000000 +1000
|
||||
@@ -557,6 +557,15 @@
|
||||
0.0,
|
||||
G_PARAM_READABLE | G_PARAM_WRITABLE));
|
||||
|
||||
+ gtk_widget_class_install_style_property (widget_class,
|
||||
+ g_param_spec_int ("min_width",
|
||||
+ _("Minimum width"),
|
||||
+ _("Minimum width of the entry field"),
|
||||
+ 0,
|
||||
+ G_MAXINT,
|
||||
+ MIN_ENTRY_WIDTH,
|
||||
+ G_PARAM_READABLE));
|
||||
+
|
||||
signals[POPULATE_POPUP] =
|
||||
g_signal_new ("populate_popup",
|
||||
G_OBJECT_CLASS_TYPE (gobject_class),
|
||||
@@ -1124,7 +1133,7 @@
|
||||
{
|
||||
GtkEntry *entry = GTK_ENTRY (widget);
|
||||
PangoFontMetrics *metrics;
|
||||
- gint xborder, yborder;
|
||||
+ gint xborder, yborder, min_width;
|
||||
PangoContext *context;
|
||||
|
||||
gtk_widget_ensure_style (widget);
|
||||
@@ -1140,9 +1149,11 @@
|
||||
|
||||
xborder += INNER_BORDER;
|
||||
yborder += INNER_BORDER;
|
||||
-
|
||||
+
|
||||
+ gtk_widget_style_get (widget, "min_width", &min_width, NULL);
|
||||
+
|
||||
if (entry->width_chars < 0)
|
||||
- requisition->width = MIN_ENTRY_WIDTH + xborder * 2;
|
||||
+ requisition->width = min_width + xborder * 2;
|
||||
else
|
||||
{
|
||||
gint char_width = pango_font_metrics_get_approximate_char_width (metrics);
|
||||
--- gtk+-2.4.1/gtk/gtkrange.c 2004-03-06 14:38:08.000000000 +1100
|
||||
+++ gtk+-2.4.1/gtk/gtkrange.c 2004-05-26 14:52:17.000000000 +1000
|
||||
@@ -180,6 +180,7 @@
|
||||
static GtkWidgetClass *parent_class = NULL;
|
||||
static guint signals[LAST_SIGNAL];
|
||||
|
||||
+static GdkAtom recognize_protocols_atom, atom_atom;
|
||||
|
||||
GType
|
||||
gtk_range_get_type (void)
|
||||
@@ -220,6 +221,9 @@
|
||||
object_class = (GtkObjectClass*) class;
|
||||
widget_class = (GtkWidgetClass*) class;
|
||||
|
||||
+ recognize_protocols_atom = gdk_atom_intern ("RECOGNIZE_PROTOCOLS", FALSE);
|
||||
+ atom_atom = gdk_atom_intern ("ATOM", FALSE);
|
||||
+
|
||||
parent_class = g_type_class_peek_parent (class);
|
||||
|
||||
gobject_class->set_property = gtk_range_set_property;
|
||||
@@ -815,6 +819,12 @@
|
||||
&attributes, attributes_mask);
|
||||
gdk_window_set_user_data (range->event_window, range);
|
||||
|
||||
+ gdk_property_change (range->event_window,
|
||||
+ recognize_protocols_atom,
|
||||
+ atom_atom,
|
||||
+ 32, GDK_PROP_MODE_REPLACE,
|
||||
+ NULL, 0);
|
||||
+
|
||||
widget->style = gtk_style_attach (widget->style, widget->window);
|
||||
}
|
||||
|
||||
@@ -1186,7 +1196,7 @@
|
||||
|
||||
/* ignore presses when we're already doing something else. */
|
||||
if (range->layout->grab_location != MOUSE_OUTSIDE)
|
||||
- return FALSE;
|
||||
+ return TRUE;
|
||||
|
||||
range->layout->mouse_x = event->x;
|
||||
range->layout->mouse_y = event->y;
|
||||
@@ -1364,7 +1374,7 @@
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
- return FALSE;
|
||||
+ return TRUE;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
--- gtk+-2.4.3/gtk/gtklabel.c~ 2004-06-11 13:50:34.000000000 +0100
|
||||
+++ gtk+-2.4.3/gtk/gtklabel.c 2004-07-05 13:33:57.000000000 +0100
|
||||
@@ -1623,6 +1623,7 @@
|
||||
|
||||
/* We have to clear the layout, fonts etc. may have changed */
|
||||
gtk_label_clear_layout (label);
|
||||
+ gtk_widget_queue_resize (GTK_WIDGET (label));
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
--- gtk+-2.6.0/configure.in.old 2005-01-01 16:23:45.000000000 +0000
|
||||
+++ gtk+-2.6.0/configure.in 2005-01-01 16:24:03.000000000 +0000
|
||||
@@ -360,7 +360,7 @@
|
||||
AC_MSG_CHECKING([Whether to write dependencies into .pc files])
|
||||
case $enable_explicit_deps in
|
||||
auto)
|
||||
- deplib_check_method=`(./libtool --config; echo eval echo \\$deplib_check_method) | sh`
|
||||
+ deplib_check_method=`($host_alias-libtool --config; echo eval echo \\$deplib_check_method) | sh`
|
||||
if test "X$deplib_check_method" = Xnone || test "x$enable_static" = xyes ; then
|
||||
enable_explicit_deps=yes
|
||||
else
|
||||
@@ -688,7 +688,7 @@
|
||||
dnl Now we check to see if our libtool supports shared lib deps
|
||||
dnl (in a rather ugly way even)
|
||||
if $dynworks; then
|
||||
- pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config"
|
||||
+ pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} $host_alias-libtool --config"
|
||||
pixbuf_deplibs_check=`$pixbuf_libtool_config | \
|
||||
grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
|
||||
sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
|
||||
@@ -1512,7 +1512,7 @@
|
||||
#
|
||||
# We are using gmodule-no-export now, but I'm leaving the stripping
|
||||
# code in place for now, since pango and atk still require gmodule.
|
||||
-export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
|
||||
+export_dynamic=`($host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
|
||||
if test -n "$export_dynamic"; then
|
||||
GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"`
|
||||
GDK_PIXBUF_XLIB_DEP_LIBS=`echo $GDK_PIXBUF_XLIB_DEP_LIBS | sed -e "s/$export_dynamic//"`
|
||||
|
|
@ -1,50 +0,0 @@
|
|||
--- gtk+-2.4.4/gtk/gtkmenushell.c.old Thu Aug 26 23:45:28 2004
|
||||
+++ gtk+-2.4.4/gtk/gtkmenushell.c Fri Aug 27 00:13:33 2004
|
||||
@@ -37,7 +37,7 @@
|
||||
#include "gtktearoffmenuitem.h"
|
||||
#include "gtkwindow.h"
|
||||
|
||||
-#define MENU_SHELL_TIMEOUT 500
|
||||
+#define MENU_SHELL_TIMEOUT 2000
|
||||
|
||||
enum {
|
||||
DEACTIVATE,
|
||||
@@ -156,6 +156,7 @@
|
||||
static GtkContainerClass *parent_class = NULL;
|
||||
static guint menu_shell_signals[LAST_SIGNAL] = { 0 };
|
||||
|
||||
+static int last_crossing_time;
|
||||
|
||||
GType
|
||||
gtk_menu_shell_get_type (void)
|
||||
@@ -418,6 +419,7 @@
|
||||
gtk_grab_add (GTK_WIDGET (menu_shell));
|
||||
menu_shell->have_grab = TRUE;
|
||||
menu_shell->active = TRUE;
|
||||
+ last_crossing_time = 0;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -545,6 +547,13 @@
|
||||
menu_shell->activate_time = 0;
|
||||
deactivate = FALSE;
|
||||
}
|
||||
+
|
||||
+ if (last_crossing_time != 0
|
||||
+ && ((event->time - last_crossing_time) < 500))
|
||||
+ {
|
||||
+ last_crossing_time = 0;
|
||||
+ deactivate = FALSE;
|
||||
+ }
|
||||
|
||||
if (deactivate)
|
||||
{
|
||||
@@ -597,6 +606,8 @@
|
||||
if (menu_shell->active)
|
||||
{
|
||||
menu_item = gtk_get_event_widget ((GdkEvent*) event);
|
||||
+
|
||||
+ last_crossing_time = event->time;
|
||||
|
||||
if (!menu_item ||
|
||||
(GTK_IS_MENU_ITEM (menu_item) &&
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
--- gtk+-2.4.1/Makefile.am~ 2004-01-17 22:15:56.000000000 +0000
|
||||
+++ gtk+-2.4.1/Makefile.am 2004-05-08 12:25:32.000000000 +0100
|
||||
@@ -1,6 +1,6 @@
|
||||
## Makefile.am for GTK+
|
||||
|
||||
-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests contrib
|
||||
+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests contrib
|
||||
SUBDIRS = po po-properties $(SRC_SUBDIRS) docs build m4macros
|
||||
|
||||
# require automake 1.4
|
||||
|
|
@ -1,151 +0,0 @@
|
|||
diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c
|
||||
--- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c 2004-11-30 14:57:14 +00:00
|
||||
+++ gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c 2005-01-02 15:38:06 +00:00
|
||||
@@ -576,12 +576,14 @@
|
||||
GDK_GC_GET_XGC (gc), x, y, (XChar2b *) text, text_length / 2);
|
||||
}
|
||||
}
|
||||
+#ifdef HAVE_XWC
|
||||
else if (font->type == GDK_FONT_FONTSET)
|
||||
{
|
||||
XFontSet fontset = (XFontSet) GDK_FONT_XFONT (font);
|
||||
XmbDrawString (xdisplay, impl->xid,
|
||||
fontset, GDK_GC_GET_XGC (gc), x, y, text, text_length);
|
||||
}
|
||||
+#endif
|
||||
else
|
||||
g_error("undefined font type\n");
|
||||
}
|
||||
@@ -613,6 +615,7 @@
|
||||
GDK_GC_GET_XGC (gc), x, y, text_8bit, text_length);
|
||||
g_free (text_8bit);
|
||||
}
|
||||
+#ifdef HAVE_XWC
|
||||
else if (font->type == GDK_FONT_FONTSET)
|
||||
{
|
||||
if (sizeof(GdkWChar) == sizeof(wchar_t))
|
||||
@@ -633,6 +636,7 @@
|
||||
g_free (text_wchar);
|
||||
}
|
||||
}
|
||||
+#endif
|
||||
else
|
||||
g_error("undefined font type\n");
|
||||
}
|
||||
diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c gtk+-2.6.0/gdk/x11/gdkfont-x11.c
|
||||
--- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c 2004-08-26 01:23:46 +01:00
|
||||
+++ gtk+-2.6.0/gdk/x11/gdkfont-x11.c 2005-01-02 15:45:39 +00:00
|
||||
@@ -525,10 +525,12 @@
|
||||
width = XTextWidth16 (xfont, (XChar2b *) text, text_length / 2);
|
||||
}
|
||||
break;
|
||||
+#ifdef HAVE_XWC
|
||||
case GDK_FONT_FONTSET:
|
||||
fontset = (XFontSet) private->xfont;
|
||||
width = XmbTextEscapement (fontset, text, text_length);
|
||||
break;
|
||||
+#endif
|
||||
default:
|
||||
width = 0;
|
||||
}
|
||||
@@ -578,6 +580,7 @@
|
||||
width = 0;
|
||||
}
|
||||
break;
|
||||
+#ifdef HAVE_XWC
|
||||
case GDK_FONT_FONTSET:
|
||||
if (sizeof(GdkWChar) == sizeof(wchar_t))
|
||||
{
|
||||
@@ -595,6 +598,7 @@
|
||||
g_free (text_wchar);
|
||||
}
|
||||
break;
|
||||
+#endif
|
||||
default:
|
||||
width = 0;
|
||||
}
|
||||
@@ -667,6 +671,7 @@
|
||||
if (descent)
|
||||
*descent = overall.descent;
|
||||
break;
|
||||
+#ifdef HAVE_XWC
|
||||
case GDK_FONT_FONTSET:
|
||||
fontset = (XFontSet) private->xfont;
|
||||
XmbTextExtents (fontset, text, text_length, &ink, &logical);
|
||||
@@ -681,6 +686,7 @@
|
||||
if (descent)
|
||||
*descent = ink.y + ink.height;
|
||||
break;
|
||||
+#endif
|
||||
}
|
||||
|
||||
}
|
||||
@@ -753,6 +759,7 @@
|
||||
*descent = overall.descent;
|
||||
break;
|
||||
}
|
||||
+#ifdef HAVE_XWC
|
||||
case GDK_FONT_FONTSET:
|
||||
fontset = (XFontSet) private->xfont;
|
||||
|
||||
@@ -780,6 +787,7 @@
|
||||
if (descent)
|
||||
*descent = ink.y + ink.height;
|
||||
break;
|
||||
+#endif
|
||||
}
|
||||
|
||||
}
|
||||
diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkim-x11.c gtk+-2.6.0/gdk/x11/gdkim-x11.c
|
||||
--- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkim-x11.c 2004-11-17 00:55:10 +00:00
|
||||
+++ gtk+-2.6.0/gdk/x11/gdkim-x11.c 2005-01-02 15:42:04 +00:00
|
||||
@@ -48,6 +48,7 @@
|
||||
void
|
||||
_gdk_x11_initialize_locale (void)
|
||||
{
|
||||
+#ifdef HAVE_XWC
|
||||
wchar_t result;
|
||||
gchar *current_locale;
|
||||
static char *last_locale = NULL;
|
||||
@@ -93,7 +94,8 @@
|
||||
GDK_NOTE (XIM,
|
||||
g_message ("%s multi-byte string functions.",
|
||||
gdk_use_mb ? "Using" : "Not using"));
|
||||
-
|
||||
+#endif
|
||||
+
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -136,6 +138,7 @@
|
||||
{
|
||||
gchar *mbstr;
|
||||
|
||||
+#ifdef HAVE_XWC
|
||||
if (gdk_use_mb)
|
||||
{
|
||||
GdkDisplay *display = find_a_display ();
|
||||
@@ -178,6 +181,7 @@
|
||||
XFree (tpr.value);
|
||||
}
|
||||
else
|
||||
+#endif
|
||||
{
|
||||
gint length = 0;
|
||||
gint i;
|
||||
@@ -210,6 +214,7 @@
|
||||
gint
|
||||
gdk_mbstowcs (GdkWChar *dest, const gchar *src, gint dest_max)
|
||||
{
|
||||
+#ifdef HAVE_XWC
|
||||
if (gdk_use_mb)
|
||||
{
|
||||
GdkDisplay *display = find_a_display ();
|
||||
@@ -242,6 +247,7 @@
|
||||
return len_cpy;
|
||||
}
|
||||
else
|
||||
+#endif
|
||||
{
|
||||
gint i;
|
||||
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
--- gtk+-2.4.4/gtk/gtkrange.c~ 2004-08-23 01:50:22.000000000 +0100
|
||||
+++ gtk+-2.4.4/gtk/gtkrange.c 2004-08-27 15:48:49.000000000 +0100
|
||||
@@ -35,9 +35,9 @@
|
||||
#include "gtkintl.h"
|
||||
#include "gtkscrollbar.h"
|
||||
|
||||
-#define SCROLL_INITIAL_DELAY 250 /* must hold button this long before ... */
|
||||
-#define SCROLL_LATER_DELAY 100 /* ... it starts repeating at this rate */
|
||||
-#define UPDATE_DELAY 300 /* Delay for queued update */
|
||||
+#define SCROLL_INITIAL_DELAY 500 /* must hold button this long before ... */
|
||||
+#define SCROLL_LATER_DELAY 200 /* ... it starts repeating at this rate */
|
||||
+#define UPDATE_DELAY 1000 /* Delay for queued update */
|
||||
|
||||
enum {
|
||||
PROP_0,
|
||||
|
|
@ -1,54 +0,0 @@
|
|||
diff -urNd ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkcalendar.c gtk+-2.6.3/gtk/gtkcalendar.c
|
||||
--- ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkcalendar.c 2005-04-06 16:57:04 +01:00
|
||||
+++ gtk+-2.6.3/gtk/gtkcalendar.c 2005-04-06 20:05:18 +01:00
|
||||
@@ -1023,9 +1023,11 @@
|
||||
}
|
||||
|
||||
gtk_calendar_select_and_focus_day (calendar, day);
|
||||
- }
|
||||
+
|
||||
+ // This change causes the calendar to disappear after choosing a day
|
||||
+/* }
|
||||
else if (event->type == GDK_2BUTTON_PRESS)
|
||||
- {
|
||||
+ {*/
|
||||
private_data->in_drag = 0;
|
||||
if (day_month == MONTH_CURRENT)
|
||||
g_signal_emit (calendar,
|
||||
diff -urNd ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkfilesel.c gtk+-2.6.3/gtk/gtkfilesel.c
|
||||
--- ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkfilesel.c 2005-04-06 16:57:07 +01:00
|
||||
+++ gtk+-2.6.3/gtk/gtkfilesel.c 2005-04-07 13:40:32 +01:00
|
||||
@@ -2468,6 +2468,33 @@
|
||||
if (fs->last_selected != NULL)
|
||||
g_free (fs->last_selected);
|
||||
|
||||
+ // Single-click directory entry
|
||||
+ if (new_names->len == 1)
|
||||
+ {
|
||||
+ GtkTreeView *tree_view;
|
||||
+ GtkTreeModel *model;
|
||||
+ GtkTreePath *path;
|
||||
+ GtkTreeIter iter;
|
||||
+ gboolean is_file;
|
||||
+
|
||||
+ tree_view = gtk_tree_selection_get_tree_view (selection);
|
||||
+
|
||||
+ if (gtk_tree_selection_get_selected (selection, &model, &iter))
|
||||
+ {
|
||||
+ path = gtk_tree_model_get_path (model, &iter);
|
||||
+ gtk_tree_model_get (model, &iter, ISFILE_COLUMN, &is_file, -1);
|
||||
+
|
||||
+ if (!is_file)
|
||||
+ {
|
||||
+ gtk_file_selection_dir_activate (tree_view, path,
|
||||
+ gtk_tree_view_get_column (tree_view, DIR_COLUMN),
|
||||
+ user_data);
|
||||
+ }
|
||||
+
|
||||
+ gtk_tree_path_free (path);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
fs->last_selected = g_strdup (g_ptr_array_index (new_names, index));
|
||||
filename = get_real_filename (fs->last_selected, FALSE);
|
||||
|
||||
|
|
@ -1,267 +0,0 @@
|
|||
diff -urNd ../gtk+-2.4.4-r5/gtk+-2.4.4/gtk/gtkfilesel.c gtk+-2.4.4/gtk/gtkfilesel.c
|
||||
--- ../gtk+-2.4.4-r5/gtk+-2.4.4/gtk/gtkfilesel.c 2004-07-10 05:02:10.000000000 +0100
|
||||
+++ gtk+-2.4.4/gtk/gtkfilesel.c 2004-09-13 13:40:09.000000000 +0100
|
||||
@@ -68,6 +68,7 @@
|
||||
#include "gtkprivate.h"
|
||||
#include "gtkscrolledwindow.h"
|
||||
#include "gtkstock.h"
|
||||
+#include "gtksignal.h"
|
||||
#include "gtktreeselection.h"
|
||||
#include "gtktreeview.h"
|
||||
#include "gtkvbox.h"
|
||||
@@ -77,6 +78,7 @@
|
||||
#include "gtkmessagedialog.h"
|
||||
#include "gtkdnd.h"
|
||||
#include "gtkeventbox.h"
|
||||
+#include "gtkimage.h"
|
||||
|
||||
#undef GTK_DISABLE_DEPRECATED
|
||||
#include "gtkoptionmenu.h"
|
||||
@@ -245,7 +247,8 @@
|
||||
};
|
||||
|
||||
enum {
|
||||
- DIR_COLUMN
|
||||
+ DIR_COLUMN,
|
||||
+ ISFILE_COLUMN
|
||||
};
|
||||
|
||||
enum {
|
||||
@@ -400,6 +403,12 @@
|
||||
GtkTreePath *path,
|
||||
GtkTreeViewColumn *column,
|
||||
gpointer user_data);
|
||||
+
|
||||
+static void gtk_file_selection_activate (GtkTreeView *tree_view,
|
||||
+ GtkTreePath *path,
|
||||
+ GtkTreeViewColumn *column,
|
||||
+ gpointer user_data);
|
||||
+
|
||||
static void gtk_file_selection_file_changed (GtkTreeSelection *selection,
|
||||
gpointer user_data);
|
||||
static void gtk_file_selection_dir_activate (GtkTreeView *tree_view,
|
||||
@@ -419,6 +428,7 @@
|
||||
static void gtk_file_selection_create_dir (GtkWidget *widget, gpointer data);
|
||||
static void gtk_file_selection_delete_file (GtkWidget *widget, gpointer data);
|
||||
static void gtk_file_selection_rename_file (GtkWidget *widget, gpointer data);
|
||||
+static void gtk_file_selection_style_set (GtkWidget *widget, GtkStyle *prev_style);
|
||||
|
||||
static void free_selected_names (GPtrArray *names);
|
||||
|
||||
@@ -578,6 +588,23 @@
|
||||
G_PARAM_WRITABLE));
|
||||
object_class->destroy = gtk_file_selection_destroy;
|
||||
widget_class->map = gtk_file_selection_map;
|
||||
+ widget_class->style_set = gtk_file_selection_style_set;
|
||||
+
|
||||
+ gtk_widget_class_install_style_property (widget_class,
|
||||
+ g_param_spec_boolean ("show_fileops_default",
|
||||
+ _("Show fileop buttons by default"),
|
||||
+ _("Whether file operation buttons are shown by default"),
|
||||
+ TRUE,
|
||||
+ G_PARAM_READABLE));
|
||||
+
|
||||
+ gtk_widget_class_install_style_property (widget_class,
|
||||
+ g_param_spec_int ("border_width",
|
||||
+ _("Border width"),
|
||||
+ _("Width of border around the main dialog area"),
|
||||
+ 0,
|
||||
+ G_MAXINT,
|
||||
+ 10,
|
||||
+ G_PARAM_READABLE));
|
||||
}
|
||||
|
||||
static void gtk_file_selection_set_property (GObject *object,
|
||||
@@ -649,7 +676,29 @@
|
||||
gtk_widget_grab_default (widget);
|
||||
return FALSE;
|
||||
}
|
||||
-
|
||||
+
|
||||
+static void
|
||||
+gtk_file_selection_style_set (GtkWidget *filesel,
|
||||
+ GtkStyle *prev_style)
|
||||
+{
|
||||
+ gboolean show_fileops;
|
||||
+ gint border_width;
|
||||
+
|
||||
+ gtk_widget_style_get (filesel,
|
||||
+ "show_fileops_default",
|
||||
+ &show_fileops,
|
||||
+ "border_width",
|
||||
+ &border_width,
|
||||
+ NULL);
|
||||
+
|
||||
+ gtk_container_set_border_width (GTK_CONTAINER (filesel), border_width);
|
||||
+
|
||||
+ if (show_fileops)
|
||||
+ gtk_file_selection_show_fileop_buttons (GTK_FILE_SELECTION (filesel));
|
||||
+ else
|
||||
+ gtk_file_selection_hide_fileop_buttons (GTK_FILE_SELECTION (filesel));
|
||||
+}
|
||||
+
|
||||
static void
|
||||
gtk_file_selection_init (GtkFileSelection *filesel)
|
||||
{
|
||||
@@ -674,17 +723,15 @@
|
||||
|
||||
/* The dialog-sized vertical box */
|
||||
filesel->main_vbox = dialog->vbox;
|
||||
- gtk_container_set_border_width (GTK_CONTAINER (filesel), 10);
|
||||
|
||||
/* The horizontal box containing create, rename etc. buttons */
|
||||
filesel->button_area = gtk_hbutton_box_new ();
|
||||
gtk_button_box_set_layout (GTK_BUTTON_BOX (filesel->button_area), GTK_BUTTONBOX_START);
|
||||
- gtk_box_set_spacing (GTK_BOX (filesel->button_area), 0);
|
||||
gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->button_area,
|
||||
FALSE, FALSE, 0);
|
||||
gtk_widget_show (filesel->button_area);
|
||||
|
||||
- gtk_file_selection_show_fileop_buttons (filesel);
|
||||
+ gtk_file_selection_style_set (GTK_WIDGET (filesel), NULL);
|
||||
|
||||
/* hbox for pulldown menu */
|
||||
pulldown_hbox = gtk_hbox_new (TRUE, 5);
|
||||
@@ -723,25 +770,32 @@
|
||||
|
||||
/* The directories list */
|
||||
|
||||
- model = gtk_list_store_new (1, G_TYPE_STRING);
|
||||
+ model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_BOOLEAN); /* MA */
|
||||
filesel->dir_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model));
|
||||
g_object_unref (model);
|
||||
|
||||
- column = gtk_tree_view_column_new_with_attributes (_("Folders"),
|
||||
+ column = gtk_tree_view_column_new_with_attributes (/*_("Folders")*/ NULL,
|
||||
gtk_cell_renderer_text_new (),
|
||||
"text", DIR_COLUMN,
|
||||
NULL);
|
||||
label = gtk_label_new_with_mnemonic (_("Fol_ders"));
|
||||
gtk_label_set_mnemonic_widget (GTK_LABEL (label), filesel->dir_list);
|
||||
gtk_widget_show (label);
|
||||
- gtk_tree_view_column_set_widget (column, label);
|
||||
+
|
||||
+ /* gtk_tree_view_column_set_widget (column, label); */
|
||||
+ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (filesel->dir_list), FALSE);
|
||||
+
|
||||
gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
|
||||
gtk_tree_view_append_column (GTK_TREE_VIEW (filesel->dir_list), column);
|
||||
|
||||
gtk_widget_set_size_request (filesel->dir_list,
|
||||
DIR_LIST_WIDTH, DIR_LIST_HEIGHT);
|
||||
g_signal_connect (filesel->dir_list, "row_activated",
|
||||
- G_CALLBACK (gtk_file_selection_dir_activate), filesel);
|
||||
+ G_CALLBACK (gtk_file_selection_activate), filesel);
|
||||
+
|
||||
+ g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (filesel->dir_list)), "changed",
|
||||
+ G_CALLBACK (gtk_file_selection_file_changed), filesel);
|
||||
+
|
||||
|
||||
/* gtk_clist_column_titles_passive (GTK_CLIST (filesel->dir_list)); */
|
||||
|
||||
@@ -758,41 +812,6 @@
|
||||
gtk_widget_show (filesel->dir_list);
|
||||
gtk_widget_show (scrolled_win);
|
||||
|
||||
- /* The files list */
|
||||
- model = gtk_list_store_new (1, G_TYPE_STRING);
|
||||
- filesel->file_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model));
|
||||
- g_object_unref (model);
|
||||
-
|
||||
- column = gtk_tree_view_column_new_with_attributes (_("Files"),
|
||||
- gtk_cell_renderer_text_new (),
|
||||
- "text", FILE_COLUMN,
|
||||
- NULL);
|
||||
- label = gtk_label_new_with_mnemonic (_("_Files"));
|
||||
- gtk_label_set_mnemonic_widget (GTK_LABEL (label), filesel->file_list);
|
||||
- gtk_widget_show (label);
|
||||
- gtk_tree_view_column_set_widget (column, label);
|
||||
- gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
|
||||
- gtk_tree_view_append_column (GTK_TREE_VIEW (filesel->file_list), column);
|
||||
-
|
||||
- gtk_widget_set_size_request (filesel->file_list,
|
||||
- FILE_LIST_WIDTH, FILE_LIST_HEIGHT);
|
||||
- g_signal_connect (filesel->file_list, "row_activated",
|
||||
- G_CALLBACK (gtk_file_selection_file_activate), filesel);
|
||||
- g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (filesel->file_list)), "changed",
|
||||
- G_CALLBACK (gtk_file_selection_file_changed), filesel);
|
||||
-
|
||||
- /* gtk_clist_column_titles_passive (GTK_CLIST (filesel->file_list)); */
|
||||
-
|
||||
- scrolled_win = gtk_scrolled_window_new (NULL, NULL);
|
||||
- gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_win), GTK_SHADOW_IN);
|
||||
- gtk_container_add (GTK_CONTAINER (scrolled_win), filesel->file_list);
|
||||
- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win),
|
||||
- GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
|
||||
- gtk_container_set_border_width (GTK_CONTAINER (scrolled_win), 0);
|
||||
- gtk_container_add (GTK_CONTAINER (list_container), scrolled_win);
|
||||
- gtk_widget_show (filesel->file_list);
|
||||
- gtk_widget_show (scrolled_win);
|
||||
-
|
||||
/* action area for packing buttons into. */
|
||||
filesel->action_area = gtk_hbox_new (TRUE, 0);
|
||||
gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->action_area,
|
||||
@@ -2008,6 +2027,23 @@
|
||||
}
|
||||
|
||||
static void
|
||||
+gtk_file_selection_activate (GtkTreeView *tree_view,
|
||||
+ GtkTreePath *path,
|
||||
+ GtkTreeViewColumn *column,
|
||||
+ gpointer user_data)
|
||||
+{
|
||||
+ GtkTreeModel *model = gtk_tree_view_get_model (tree_view);
|
||||
+ GtkTreeIter iter;
|
||||
+ gboolean is_file;
|
||||
+
|
||||
+ gtk_tree_model_get_iter (model, &iter, path);
|
||||
+ gtk_tree_model_get (model, &iter, ISFILE_COLUMN, &is_file, -1);
|
||||
+
|
||||
+ if (! is_file)
|
||||
+ gtk_file_selection_dir_activate (tree_view, path, column, user_data);
|
||||
+}
|
||||
+
|
||||
+static void
|
||||
gtk_file_selection_file_activate (GtkTreeView *tree_view,
|
||||
GtkTreePath *path,
|
||||
GtkTreeViewColumn *column,
|
||||
@@ -2103,7 +2139,6 @@
|
||||
PossibleCompletion* poss;
|
||||
GtkTreeIter iter;
|
||||
GtkListStore *dir_model;
|
||||
- GtkListStore *file_model;
|
||||
gchar* filename;
|
||||
gchar* rem_path = rel_path;
|
||||
gchar* sel_text;
|
||||
@@ -2125,10 +2160,8 @@
|
||||
g_assert (cmpl_state->reference_dir);
|
||||
|
||||
dir_model = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (fs->dir_list)));
|
||||
- file_model = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (fs->file_list)));
|
||||
|
||||
gtk_list_store_clear (dir_model);
|
||||
- gtk_list_store_clear (file_model);
|
||||
|
||||
/* Set the dir list to include ./ and ../ */
|
||||
gtk_list_store_append (dir_model, &iter);
|
||||
@@ -2150,13 +2183,17 @@
|
||||
strcmp (filename, ".." G_DIR_SEPARATOR_S) != 0)
|
||||
{
|
||||
gtk_list_store_append (dir_model, &iter);
|
||||
- gtk_list_store_set (dir_model, &iter, DIR_COLUMN, filename, -1);
|
||||
+ gtk_list_store_set (dir_model, &iter,
|
||||
+ DIR_COLUMN, filename,
|
||||
+ ISFILE_COLUMN, FALSE, -1);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
- gtk_list_store_append (file_model, &iter);
|
||||
- gtk_list_store_set (file_model, &iter, DIR_COLUMN, filename, -1);
|
||||
+ gtk_list_store_append (dir_model, &iter);
|
||||
+ gtk_list_store_set (dir_model, &iter,
|
||||
+ DIR_COLUMN, filename,
|
||||
+ ISFILE_COLUMN, TRUE, -1);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1,128 +0,0 @@
|
|||
--- gtk+-2.4.3/gtk/gtkspinbutton.c.old 2004-04-22 14:49:27.000000000 +0100
|
||||
+++ gtk+-2.4.3/gtk/gtkspinbutton.c 2004-06-30 21:48:18.000000000 +0100
|
||||
@@ -733,7 +733,7 @@
|
||||
|
||||
spin = GTK_SPIN_BUTTON (widget);
|
||||
arrow_size = spin_button_get_arrow_size (spin);
|
||||
- panel_width = arrow_size + 2 * widget->style->xthickness;
|
||||
+ panel_width = (2 * arrow_size) + 4 * widget->style->xthickness;
|
||||
|
||||
widget->allocation = *allocation;
|
||||
|
||||
@@ -866,19 +866,16 @@
|
||||
{
|
||||
width = spin_button_get_arrow_size (spin_button) + 2 * widget->style->xthickness;
|
||||
|
||||
+ y = widget->style->ythickness;
|
||||
+ height = widget->requisition.height - (2 * y);
|
||||
+
|
||||
if (arrow_type == GTK_ARROW_UP)
|
||||
{
|
||||
x = 0;
|
||||
- y = 0;
|
||||
-
|
||||
- height = widget->requisition.height / 2;
|
||||
}
|
||||
else
|
||||
{
|
||||
- x = 0;
|
||||
- y = widget->requisition.height / 2;
|
||||
-
|
||||
- height = (widget->requisition.height + 1) / 2;
|
||||
+ x = width;
|
||||
}
|
||||
|
||||
if (spin_button_at_limit (spin_button, arrow_type))
|
||||
@@ -908,32 +905,17 @@
|
||||
shadow_type = GTK_SHADOW_OUT;
|
||||
}
|
||||
}
|
||||
-
|
||||
+
|
||||
gtk_paint_box (widget->style, spin_button->panel,
|
||||
state_type, shadow_type,
|
||||
NULL, widget,
|
||||
- (arrow_type == GTK_ARROW_UP)? "spinbutton_up" : "spinbutton_down",
|
||||
+ NULL,
|
||||
x, y, width, height);
|
||||
|
||||
height = widget->requisition.height;
|
||||
|
||||
- if (arrow_type == GTK_ARROW_DOWN)
|
||||
- {
|
||||
- y = height / 2;
|
||||
- height = height - y - 2;
|
||||
- }
|
||||
- else
|
||||
- {
|
||||
- y = 2;
|
||||
- height = height / 2 - 2;
|
||||
- }
|
||||
-
|
||||
width -= 3;
|
||||
-
|
||||
- if (widget && gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
|
||||
- x = 2;
|
||||
- else
|
||||
- x = 1;
|
||||
+ height -= 3;
|
||||
|
||||
w = width / 2;
|
||||
w -= w % 2 - 1; /* force odd */
|
||||
@@ -1108,7 +1090,7 @@
|
||||
if (GTK_ENTRY (widget)->editable)
|
||||
gtk_spin_button_update (spin);
|
||||
|
||||
- if (event->y <= widget->requisition.height / 2)
|
||||
+ if (event->x <= (spin_button_get_arrow_size (spin) + widget->style->xthickness))
|
||||
{
|
||||
if (event->button == 1)
|
||||
start_spinning (spin, GTK_ARROW_UP, spin->adjustment->step_increment);
|
||||
@@ -1143,44 +1125,11 @@
|
||||
|
||||
arrow_size = spin_button_get_arrow_size (spin);
|
||||
|
||||
- if (event->button == spin->button)
|
||||
- {
|
||||
- int click_child = spin->click_child;
|
||||
+ gtk_spin_button_stop_spinning (spin);
|
||||
|
||||
- gtk_spin_button_stop_spinning (spin);
|
||||
-
|
||||
- if (event->button == 3)
|
||||
- {
|
||||
- if (event->y >= 0 && event->x >= 0 &&
|
||||
- event->y <= widget->requisition.height &&
|
||||
- event->x <= arrow_size + 2 * widget->style->xthickness)
|
||||
- {
|
||||
- if (click_child == GTK_ARROW_UP &&
|
||||
- event->y <= widget->requisition.height / 2)
|
||||
- {
|
||||
- gdouble diff;
|
||||
-
|
||||
- diff = spin->adjustment->upper - spin->adjustment->value;
|
||||
- if (diff > EPSILON)
|
||||
- gtk_spin_button_real_spin (spin, diff);
|
||||
- }
|
||||
- else if (click_child == GTK_ARROW_DOWN &&
|
||||
- event->y > widget->requisition.height / 2)
|
||||
- {
|
||||
- gdouble diff;
|
||||
-
|
||||
- diff = spin->adjustment->value - spin->adjustment->lower;
|
||||
- if (diff > EPSILON)
|
||||
- gtk_spin_button_real_spin (spin, -diff);
|
||||
- }
|
||||
- }
|
||||
- }
|
||||
- spin_button_redraw (spin);
|
||||
+ spin_button_redraw (spin);
|
||||
|
||||
- return TRUE;
|
||||
- }
|
||||
- else
|
||||
- return GTK_WIDGET_CLASS (parent_class)->button_release_event (widget, event);
|
||||
+ return TRUE;
|
||||
}
|
||||
|
||||
static gint
|
||||
|
|
@ -150,6 +150,8 @@ do_install_append () {
|
|||
install -d ${D}${sysconfdir}/gtk-2.0
|
||||
}
|
||||
|
||||
PACKAGES_DYNAMIC = "gdk-pixbuf-loader-* gtk-immodule-*"
|
||||
|
||||
python populate_packages_prepend () {
|
||||
import os.path
|
||||
|
||||
|
|
|
|||
|
|
@ -64,6 +64,8 @@ fi
|
|||
|
||||
}
|
||||
|
||||
PACKAGES_DYANMIC = "gdk-pixbuf-loader-* gtk-immodule-*"
|
||||
|
||||
python populate_packages_prepend () {
|
||||
import os.path
|
||||
|
||||
|
|
|
|||
|
|
@ -1,82 +0,0 @@
|
|||
LICENSE = "LGPL"
|
||||
DESCRIPTION = "GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete \
|
||||
set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites."
|
||||
HOMEPAGE = "http://www.gtk.org"
|
||||
SECTION = "libs"
|
||||
PRIORITY = "optional"
|
||||
MAINTAINER = "Philip Blundell <pb@handhelds.org>"
|
||||
DEPENDS = "glib-2.0 pango atk jpeg libpng xext libxcursor gtk-doc libgcrypt cairo"
|
||||
PR = "r0"
|
||||
|
||||
SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-${PV}.tar.bz2 \
|
||||
file://no-xwc.patch;patch=1 \
|
||||
file://automake-lossage.patch;patch=1 \
|
||||
file://hardcoded_libtool.patch;patch=1 \
|
||||
file://disable-tooltips.patch;patch=1 \
|
||||
file://gtklabel-resize-patch;patch=1"
|
||||
# file://menu-deactivate.patch;patch=1 \
|
||||
# file://xsettings.patch;patch=1 \
|
||||
# file://scroll-timings.patch;patch=1 \
|
||||
# file://small-gtkfilesel.patch;patch=1 \
|
||||
# file://migration.patch;patch=1;pnum=0
|
||||
# file://no-demos.patch;patch=1
|
||||
# file://gtk+-handhelds.patch;patch=1
|
||||
# file://single-click.patch;patch=1
|
||||
# file://spinbutton.patch;patch=1 \
|
||||
|
||||
inherit autotools pkgconfig
|
||||
|
||||
FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
|
||||
${bindir}/gtk-query-immodules-2.0 \
|
||||
${libdir}/lib*.so.* \
|
||||
${datadir}/themes ${sysconfdir} \
|
||||
${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so"
|
||||
FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindir}/gdk-pixbuf-csource"
|
||||
|
||||
RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1"
|
||||
|
||||
EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration"
|
||||
# --disable-cruft
|
||||
|
||||
LIBV = "2.4.0"
|
||||
|
||||
do_stage () {
|
||||
oe_libinstall -so -C gtk libgtk-x11-2.0 ${STAGING_LIBDIR}
|
||||
oe_libinstall -so -C gdk libgdk-x11-2.0 ${STAGING_LIBDIR}
|
||||
oe_libinstall -so -C contrib/gdk-pixbuf-xlib libgdk_pixbuf_xlib-2.0 ${STAGING_LIBDIR}
|
||||
oe_libinstall -so -C gdk-pixbuf libgdk_pixbuf-2.0 ${STAGING_LIBDIR}
|
||||
|
||||
autotools_stage_includes
|
||||
|
||||
mkdir -p ${STAGING_LIBDIR}/gtk-2.0/include
|
||||
install -m 0644 gdk/gdkconfig.h ${STAGING_LIBDIR}/gtk-2.0/include/gdkconfig.h
|
||||
|
||||
install -m 0644 m4macros/gtk-2.0.m4 ${STAGING_DATADIR}/aclocal/
|
||||
}
|
||||
|
||||
do_install_append () {
|
||||
install -d ${D}${sysconfdir}/gtk-2.0
|
||||
}
|
||||
|
||||
postinst_prologue() {
|
||||
if [ "x$D" != "x" ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
}
|
||||
|
||||
python populate_packages_prepend () {
|
||||
import os.path
|
||||
|
||||
prologue = bb.data.getVar("postinst_prologue", d, 1)
|
||||
|
||||
gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d)
|
||||
loaders_root = os.path.join(gtk_libdir, 'loaders')
|
||||
immodules_root = os.path.join(gtk_libdir, 'immodules')
|
||||
|
||||
do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', prologue + 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders')
|
||||
do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules > /etc/gtk-2.0/gtk.immodules')
|
||||
|
||||
if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
|
||||
bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d)
|
||||
}
|
||||
|
|
@ -67,6 +67,8 @@ fi
|
|||
|
||||
}
|
||||
|
||||
PACKAGES_DYNAMIC = "gdk-pixbuf-loader-* gtk-immodule-*"
|
||||
|
||||
python populate_packages_prepend () {
|
||||
import os.path
|
||||
|
||||
|
|
|
|||
|
|
@ -38,6 +38,8 @@ fi
|
|||
|
||||
}
|
||||
|
||||
PACKAGES_DYNAMIC = "pango-module-*"
|
||||
|
||||
python populate_packages_prepend () {
|
||||
prologue = bb.data.getVar("postinst_prologue", d, 1)
|
||||
|
||||
|
|
|
|||
|
|
@ -38,6 +38,8 @@ fi
|
|||
|
||||
}
|
||||
|
||||
PACKAGES_DYNAMIC = "pango-module-*"
|
||||
|
||||
python populate_packages_prepend () {
|
||||
prologue = bb.data.getVar("postinst_prologue", d, 1)
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ HOMEPAGE = "http://www.perl.org/"
|
|||
LICENSE = "Artistic|GPL"
|
||||
SECTION = "devel"
|
||||
PRIORITY = "optional"
|
||||
DEPENDS = "db3 perl-native"
|
||||
DEPENDS = "virtual/db perl-native"
|
||||
|
||||
SRC_URI = "http://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \
|
||||
file://Makefile.patch;patch=1 \
|
||||
|
|
@ -54,6 +54,8 @@ do_stage() {
|
|||
install config.sh ${STAGING_DIR}/${HOST_SYS}/perl/
|
||||
}
|
||||
|
||||
PACKAGES_DYNAMIC = "perl-module-*"
|
||||
|
||||
python populate_packages_prepend () {
|
||||
libdir = bb.data.expand('${libdir}/perl5/${PV}', d)
|
||||
archlibdir = bb.data.expand('${libdir}/perl5/${PV}/${TARGET_ARCH}-${TARGET_OS}', d)
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ PRIORITY = "optional"
|
|||
LICENSE = "Bitstream Vera"
|
||||
PACKAGE_ARCH = "all"
|
||||
PR = "r3"
|
||||
RDEPENDS = "libfontconfig-utils"
|
||||
RDEPENDS = "fontconfig-utils"
|
||||
|
||||
SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-${PV}.tar.bz2"
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,24 @@
|
|||
diff -NurP xcursor-transparent-theme-0.1.1-orig/cursors/Makefile.am xcursor-transparent-theme-0.1.1/cursors/Makefile.am
|
||||
--- xcursor-transparent-theme-0.1.1-orig/cursors/Makefile.am 2003-10-30 13:13:59.000000000 +0100
|
||||
+++ xcursor-transparent-theme-0.1.1/cursors/Makefile.am 2005-12-20 23:35:17.000000000 +0100
|
||||
@@ -79,7 +79,7 @@
|
||||
ul_angle \
|
||||
ur_angle \
|
||||
v_double_arrow \
|
||||
- watcha \
|
||||
+ watch \
|
||||
xterm
|
||||
|
||||
CURSOR_DIR = $(datadir)/icons/xcursor-transparent/cursors
|
||||
diff -NurP xcursor-transparent-theme-0.1.1-orig/cursors/Makefile.in xcursor-transparent-theme-0.1.1/cursors/Makefile.in
|
||||
--- xcursor-transparent-theme-0.1.1-orig/cursors/Makefile.in 2003-10-31 15:31:13.000000000 +0100
|
||||
+++ xcursor-transparent-theme-0.1.1/cursors/Makefile.in 2005-12-20 23:35:36.000000000 +0100
|
||||
@@ -67,7 +67,7 @@
|
||||
PACKAGE = @PACKAGE@
|
||||
VERSION = @VERSION@
|
||||
|
||||
-CURSOR_NAMES = 00008160000006810000408080010102 028006030e0e7ebffc7f7070c0600140 03b6e0fcb3499374a867c041f52298f0 08e8e1c95fe2fc01f976f1e063a24ccd 14fef782d02440884392942c11205230 2870a09082c103050810ffdffffe0204 3ecb610c1bf2410f44200f48c40d3599 4498f0e0c1937ffe01fd06f973665830 9d800788f1b08800ae810202380a0822 c7088f0f3e6c8088236ef8e1e3e70000 d9ce0ab605698f320427677b458ad60b e29285e634086352946a0e7090d73106 fcf1c3c7cd4491d801f1e1c78f100000 X_cursor arrow base_arrow_down base_arrow_up based_arrow_down based_arrow_up bd_double_arrow boat bottom_left_corner bottom_right_corner bottom_side bottom_tee center_ptr circle cross cross_reverse crossed_circle crosshair dot dot_box_mask dotbox double_arrow draft_large draft_small draped_box exchange fd_double_arrow fleur gumby h_double_arrow hand hand1 hand2 left_ptr left_ptr_watch left_side left_tee ll_angle lr_angle move pencil pirate plus question_arrow right_ptr right_side right_tee sailboat sb_down_arrow sb_h_double_arrow sb_left_arrow sb_right_arrow sb_up_arrow sb_v_double_arrow shuttle sizing target tcross top_left_arrow top_left_corner top_right_corner top_side top_tee trek ul_angle ur_angle v_double_arrow watcha xterm
|
||||
+CURSOR_NAMES = 00008160000006810000408080010102 028006030e0e7ebffc7f7070c0600140 03b6e0fcb3499374a867c041f52298f0 08e8e1c95fe2fc01f976f1e063a24ccd 14fef782d02440884392942c11205230 2870a09082c103050810ffdffffe0204 3ecb610c1bf2410f44200f48c40d3599 4498f0e0c1937ffe01fd06f973665830 9d800788f1b08800ae810202380a0822 c7088f0f3e6c8088236ef8e1e3e70000 d9ce0ab605698f320427677b458ad60b e29285e634086352946a0e7090d73106 fcf1c3c7cd4491d801f1e1c78f100000 X_cursor arrow base_arrow_down base_arrow_up based_arrow_down based_arrow_up bd_double_arrow boat bottom_left_corner bottom_right_corner bottom_side bottom_tee center_ptr circle cross cross_reverse crossed_circle crosshair dot dot_box_mask dotbox double_arrow draft_large draft_small draped_box exchange fd_double_arrow fleur gumby h_double_arrow hand hand1 hand2 left_ptr left_ptr_watch left_side left_tee ll_angle lr_angle move pencil pirate plus question_arrow right_ptr right_side right_tee sailboat sb_down_arrow sb_h_double_arrow sb_left_arrow sb_right_arrow sb_up_arrow sb_v_double_arrow shuttle sizing target tcross top_left_arrow top_left_corner top_right_corner top_side top_tee trek ul_angle ur_angle v_double_arrow watch xterm
|
||||
|
||||
|
||||
CURSOR_DIR = $(datadir)/icons/xcursor-transparent/cursors
|
||||
|
|
@ -99,6 +99,11 @@ samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=${samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=yes}
|
|||
samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=${samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=yes}
|
||||
samba_cv_HAVE_KERNEL_SHARE_MODES=${samba_cv_HAVE_KERNEL_SHARE_MODES=yes}
|
||||
samba_cv_LINUX_LFS_SUPPORT=${samba_cv_LINUX_LFS_SUPPORT=yes}
|
||||
samba_cv_STAT_STATVFS64=${samba_cv_STAT_STATVFS64=yes}
|
||||
samba_cv_SIZEOF_OFF_T=${samba_cv_SIZEOF_OFF_T=yes}
|
||||
samba_cv_SIZEOF_INO_T=${samba_cv_SIZEOF_INO_T=yes}
|
||||
samba_cv_HAVE_STRUCT_FLOCK64=${samba_cv_HAVE_STRUCT_FLOCK64=yes}
|
||||
|
||||
|
||||
# sleepycat db
|
||||
db_cv_fcntl_f_setfd=${db_cv_fcntl_f_setfd=yes}
|
||||
|
|
|
|||
Loading…
Reference in New Issue