From 8f2373eaf2247e1c4e85dfef4d153a0aa0845b4a Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Tue, 6 Mar 2007 12:11:07 +0000 Subject: sms: Add patch fixing several issues. --- packages/gpephone/sms-1.0/.mtn2git_empty | 0 packages/gpephone/sms-1.0/somefixes.patch | 116 ++++++++++++++++++++++++++++++ packages/gpephone/sms_1.0.bb | 4 +- 3 files changed, 119 insertions(+), 1 deletion(-) create mode 100644 packages/gpephone/sms-1.0/.mtn2git_empty create mode 100644 packages/gpephone/sms-1.0/somefixes.patch (limited to 'packages') diff --git a/packages/gpephone/sms-1.0/.mtn2git_empty b/packages/gpephone/sms-1.0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gpephone/sms-1.0/somefixes.patch b/packages/gpephone/sms-1.0/somefixes.patch new file mode 100644 index 0000000000..5ef2855cea --- /dev/null +++ b/packages/gpephone/sms-1.0/somefixes.patch @@ -0,0 +1,116 @@ +Index: src/callbacks.c +=================================================================== +--- src/callbacks.c (Revision 487) ++++ src/callbacks.c (Arbeitskopie) +@@ -927,11 +927,15 @@ + + /* While we have constructed the UI manager we can create the menus as well. */ + pop_menu_left = gtk_ui_manager_get_widget (ui_manager, menu_left); +- g_signal_connect (G_OBJECT (pop_menu_left), +- "key-press-event", G_CALLBACK (popup_key_press_handler), +- NULL); +- g_signal_connect (G_OBJECT (pop_menu_left), "unmap", +- G_CALLBACK (popup_mapping_handler), NULL); ++ ++ if (pop_menu_left) ++ { ++ g_signal_connect (G_OBJECT (pop_menu_left), ++ "key-press-event", G_CALLBACK (popup_key_press_handler), ++ NULL); ++ g_signal_connect (G_OBJECT (pop_menu_left), "unmap", ++ G_CALLBACK (popup_mapping_handler), NULL); ++ } + + pop_menu_right = gtk_ui_manager_get_widget (ui_manager, menu_right); + +Index: configure.ac +=================================================================== +--- configure.ac (Revision 487) ++++ configure.ac (Arbeitskopie) +@@ -2,7 +2,8 @@ + # Process this file with autoconf to produce a configure script. + + AC_PREREQ(2.59) +-AC_INIT(sms, 0.1, gpe@handhelds.org) ++ ++AC_INIT(sms, 1.0, gpephone-devel@linuxtogo.org) + AC_CONFIG_SRCDIR([src/shared.h]) + AM_INIT_AUTOMAKE(foreign dist-bzip2) + AC_CONFIG_HEADER([config.h]) +@@ -48,7 +49,7 @@ + [ --with-gpe-dir=PATH specify location of gpephone directory ]) + + if test "x$with_gpe_dir" = "x" ; then +- GPE_DIR='$(prefix)/gpephone' ++ GPE_DIR='$(prefix)' + else + GPE_DIR=$with_gpe_dir + fi +Index: Makefile.am +=================================================================== +--- Makefile.am (Revision 487) ++++ Makefile.am (Arbeitskopie) +@@ -8,13 +8,7 @@ + pixmapsdir = $(GPE_DIR)/share/pixmaps + pixmaps_DATA = sms.png + +-EXTRA_DIR = sms.desktop.in \ +- intltool-extract.in \ +- intltool-merge.in \ +- intltool-update.in +- +- +-EXTRA_DIST = $(desktop_DATA) \ ++EXTRA_DIST = $(desktop_in_files) \ + $(pixmaps_DATA) \ + intltool-extract.in \ + intltool-merge.in \ +Index: autogen.sh +=================================================================== +--- autogen.sh (Revision 487) ++++ autogen.sh (Arbeitskopie) +@@ -1,40 +1,4 @@ +-# gettext +-PKG_NAME="libpimenabler" +-GETTEXTIZE="glib-gettextize" ++intltoolize --copy --automake --force + +-$GETTEXTIZE --version < /dev/null > /dev/null 2>&1 +-if test $? -ne 0; then +- echo +- echo "**Error**: You must have \`$GETTEXTIZE' installed" \ +- "to compile $PKG_NAME." +- DIE=1 +-fi ++autoreconf -f -i -s + +-intltoolize --version < /dev/null > /dev/null 2>&1 || { +- echo +- echo "**Error**: You must have \`intltoolize' installed" \ +- "to compile $PKG_NAME." +- DIE=1 +-} +- +-if test "$GETTEXTIZE"; then +- echo "Creating $dr/aclocal.m4 ..." +- test -r aclocal.m4 || touch aclocal.m4 +- echo "Running $GETTEXTIZE... Ignore non-fatal messages." +- echo "no" | $GETTEXTIZE --copy +- echo "Making aclocal.m4 writable ..." +- test -r aclocal.m4 && chmod u+w aclocal.m4 +-fi +-echo "Running intltoolize..." +-intltoolize --copy --automake +- +-libtoolize --copy --force +- +-autoheader +-aclocal $ACLOCAL_FLAGS +- +-automake -a $am_opt +-autoconf +- +-#echo "Fixing libtool..." +-#patch -p0 < libtool-cross.patch +Index: po/sms.pot +=================================================================== diff --git a/packages/gpephone/sms_1.0.bb b/packages/gpephone/sms_1.0.bb index 1718483b59..d1bcaf6e19 100644 --- a/packages/gpephone/sms_1.0.bb +++ b/packages/gpephone/sms_1.0.bb @@ -2,7 +2,7 @@ LICENSE = "LiPS" DESCRIPTION = "GSM Short message application" SECTION = "gpe" PRIORITY = "optional" -PR = "r0" +PR = "r1" DEPENDS = "gtk+ dbus-glib libmsgenabler libabenabler libiac libgpewidget libgpephone" @@ -10,4 +10,6 @@ GPE_TARBALL_SUFFIX = "bz2" inherit gpephone autotools +SRC_URI += " file://somefixes.patch;patch=1;pnum=0" + FILES_${PN} += "${datadir}/conf ${datadir}/graphic" -- cgit v1.2.3