Fixes for oe-core changes

index 9fd0ac0..46b19a1 100644
@@ -4,7 +4,7 @@ LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1d4b0366557951c84a94fabe3529f867"
 SECTION = "console/network"
 DEPENDS = "libpcap"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = " \
 	http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz \

index a59488d..a3db952 100644
@@ -9,7 +9,7 @@ INC_PR = "r3"
 
 export XDG_DATA_DIRS = "${STAGING_DATADIR}"
 
-SRC_URI = "http://downloads.freesmartphone.org/sources/vala-dbus-binding-tool-${PV}.tar.bz2;name=archive"
+SRC_URI = "http://downloads.freesmartphone.org/sources/${BPN}/${BP}.tar.bz2;name=archive"
 
 inherit autotools perlnative
 

new file mode 100644
index 0000000..3473971
@@ -0,0 +1,4 @@
+require vala-dbus-binding-tool.inc
+
+SRC_URI[archive.md5sum] = "b7537a087f9f468e25170e81df0ed93f"
+SRC_URI[archive.sha256sum] = "6b0d3796e92b031839e2e2f484e294153ad9eaf9d32915056199a49ce8328722"

index 30a7edd..dd96187 100644
@@ -1,6 +1,9 @@
 require vala-dbus-binding-tool.inc
-SRCREV = "2c72ff9c981be947837c72d3aa38e1fbf074068f"
-PV = "0.3.2+gitr${SRCPV}"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRCREV = "53d56816a4154e3467f07bd22f4e27d166e3e3f3"
+PV = "0.4.0+gitr${SRCPV}"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/vala-dbus-binding-tool.git;protocol=git;branch=master"
 S = "${WORKDIR}/git"

index e2a3e3d..e54b8d3 100644
@@ -5,14 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
 BPN = "libwnck"
 
 SECTION = "x11/libs"
-DEPENDS = "gobject-introspection-native gtk+3 gdk-pixbuf-native"
+DEPENDS = "gobject-introspection-stub gtk+3 gdk-pixbuf-native"
+
+PR = "r1"
 
 inherit gnome
 SRC_URI[archive.md5sum] = "e4ea87320dd0600a81c50186e3804aae"
 SRC_URI[archive.sha256sum] = "4946b612c22d53238810d431f1b05c21f073f201edfd247ff74e2fa228618083"
-
-EXTRA_OECONF += "--enable-introspection=no"
-
-do_configure_prepend() {
-	sed -i '/GOBJECT_INTROSPECTION_CHECK([0.6.14])/d' configure.ac
-}

index 6c8ca28..935d4a3 100644
@@ -2,17 +2,11 @@ DESCRIPTION = "Window navigation construction toolkit"
 LICENSE = "LGPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
 
-PR = "r1"
+PR = "r2"
 
 SECTION = "x11/libs"
-DEPENDS = "gobject-introspection-native gtk+ gdk-pixbuf-native"
+DEPENDS = "gobject-introspection-stub gtk+ gdk-pixbuf-native"
 
 inherit gnome
 SRC_URI[archive.md5sum] = "4162d5b96151e6d24ec02ae3a822203c"
 SRC_URI[archive.sha256sum] = "56b6681e89cd45491bb640165d62276d81369a08974042b26645dc1e0e954cc1"
-
-EXTRA_OECONF += "--enable-introspection=no"
-
-do_configure_prepend() {
-	sed -i '/GOBJECT_INTROSPECTION_CHECK([0.6.14])/d' configure.ac
-}

index 4e2c643..228f96c 100644
@@ -1,9 +1,8 @@
 require libgee.inc
 PE = "1"
-PR = "${INC_PR}.0"
-#autoreconf needs introspection.m4 (staged by gobject-introspection-native) after http://git.gnome.org/browse/libgee/commit/?id=d026a29b38ca1a3388981c6e75a92602212373d8
-DEPENDS += "gobject-introspection-native"
-DEPENDS_virtclass-native += "gobject-introspection-native"
+PR = "${INC_PR}.1"
+DEPENDS += "gobject-introspection-stub"
+DEPENDS_virtclass-native += "gobject-introspection-stub-native"
 
 SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libgee/${SHRT_VER}/${BP}.tar.xz"

index 312ed58..5a33ab9 100644
@@ -2,9 +2,9 @@ DESCRIPTION = "UPower is an abstraction for enumerating power devices, listening
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=0de8fbf1d97a140d1d93b9f14dcfbf08"
 
-PR = "r1"
+PR = "r2"
 
-DEPENDS = "libusb1 udev glib-2.0 dbus-glib polkit gobject-introspection-native"
+DEPENDS = "libusb1 udev glib-2.0 dbus-glib polkit gobject-introspection-stub"
 
 SRC_URI = "http://upower.freedesktop.org/releases/${BPN}-${PV}.tar.xz"
 SRC_URI[md5sum] = "18803f82102d56aac90949d1e4251645"

deleted file mode 100644
index 1aa4304..0000000
@@ -1,41 +0,0 @@
-From e1f780fc2355c22c2c3f0a70c1a1ef2669779c53 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <[email protected]>
-Date: Tue, 24 Apr 2012 13:42:38 +0200
-Subject: [PATCH] SConstruct: fix DSO build for ntpshm, garmin_monitor
-
-| x86_64-oe-linux-gcc -m64
---sysroot=/OE/shr-core/tmp-eglibc/sysroots/qemux86-64 -o gpsmon
---sysroot=/OE/shr-core/tmp-eglibc/sysroots/qemux86-64
--Wl,-rpath=/OE/shr-core/tmp-eglibc/work/x86_64-oe-linux/gpsd/gpsd-3.4-r2/gpsd-3.4
--Wl,-rpath=/OE/shr-core/tmp-eglibc/sysroots/qemux86-64/usr/lib gpsmon.o
-monitor_italk.o monitor_nmea.o monitor_oncore.o monitor_sirf.o
-monitor_superstar2.o monitor_tnt.o monitor_ubx.o monitor_garmin.o -L.
--L/OE/shr-core/tmp-eglibc/sysroots/qemux86-64/usr/lib
--L/OE/shr-core/tmp-eglibc/sysroots/qemux86-64/lib -lrt -lbluetooth
--lgpsd -lusb-1.0 -lbluetooth -lgps -lncurses -ltinfo
-
-/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/4.6.4/ld:
-* ntpshm.o: undefined reference to symbol 'log@@GLIBC_2.2.5'
-* monitor_garmin.o: undefined reference to symbol 'hypot@@GLIBC_2.2.5'
-
-Signed-off-by: Martin Jansa <[email protected]>
----
- SConstruct |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/SConstruct b/SConstruct
-index 7bd44a1..9ff00c1 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -806,7 +806,7 @@ if qt_env:
- # The libraries have dependencies on system libraries
- 
- gpslibs = ["-lgps"]
--gpsdlibs = ["-lgpsd"] + usblibs + bluezlibs + gpslibs
-+gpsdlibs = ["-lgpsd"] + ["-lm"] + usblibs + bluezlibs + gpslibs
- 
- # Source groups
- 
--- 
-1.7.8.5
-

72 lines not on this page · raw message

123 lines not on this page · raw message

index 1b1809f..568d492 100644
@@ -7,7 +7,6 @@ PROVIDES = "virtual/gpsd"
 
 PR = "r4"
 
-DEFAULT_PREFERENCE = "-1"
 SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \
   file://0001-SConstruct-respect-sysroot-setting-when-prepending-L.patch \
   file://0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch \

deleted file mode 100644
index 9504761..0000000
@@ -1,18 +0,0 @@
-PRINC := "${@int(PRINC) + 1}"
-
-inherit systemd
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += "file://gpsd.service"
-
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "${PN}.socket"
-SYSTEMD_OESCONS = "true"
-
-do_install_append() {
-    #support for systemd
-    install -d ${D}${systemd_unitdir}/system/
-    install -m 0644 ${WORKDIR}/${PN}.service ${D}${systemd_unitdir}/system/${PN}.service
-    install -m 0644 ${S}/systemd/${PN}.socket ${D}${systemd_unitdir}/system/${PN}.socket
-}

deleted file mode 100644
index dcd3a46..0000000
@@ -1,76 +0,0 @@
-From 3dfc99730b99472d642f19b825fb9794e32a05c4 Mon Sep 17 00:00:00 2001
-From: "[email protected]"
- <[email protected]@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
-Date: Tue, 10 Apr 2012 22:59:04 +0000
-Subject: [PATCH] [CMake] Do not pass -P to the preprocessor when running
- make_names.pl.
- https://bugs.webkit.org/show_bug.cgi?id=83225
-
-Reviewed by Rob Buis.
-
-This is necessary to make CMake-based ports build with the
-recently-released GCC 4.7.0, whose preprocessor seems to ignore
-empty lines when -P is passed to it.  Such behavior breaks
-make_names.pl (in fact, InFilesParser.pm), which expects an empty
-line to separate common and specific sections in .in files.
-
-A fix for this same problem has been supposedly done in r84123,
-but as the CMake-based ports always pass --preprocessor to the
-Perl tools the fix never reached us.
-
-The idea is to define CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS
-for (!MSVC && !QNX) and use it in the macros which call
-make_names.pl.
-
-* Source/cmake/OptionsCommon.cmake:
-* Source/cmake/WebKitMacros.cmake:
-
-git-svn-id: http://svn.webkit.org/repository/webkit/trunk@113786 268f45cc-cd09-0410-ab3c-d52691b4dbfc
----
- ChangeLog                        |   24 ++++++++++++++++++++++++
- Source/cmake/OptionsCommon.cmake |    7 +++++++
- Source/cmake/WebKitMacros.cmake  |    2 +-
- 3 files changed, 32 insertions(+), 1 deletions(-)
-
-diff --git a/Source/cmake/OptionsCommon.cmake b/Source/cmake/OptionsCommon.cmake
-index 11581e6..37cb4a8 100644
---- a/Source/cmake/OptionsCommon.cmake
-+++ b/Source/cmake/OptionsCommon.cmake
-@@ -5,14 +5,21 @@ IF (WTF_OS_UNIX)
-     ADD_DEFINITIONS(-DXP_UNIX)
- ENDIF (WTF_OS_UNIX)
- 
-+# CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS only matters with GCC >= 4.7.0.  Since this
-+# version, -P does not output empty lines, which currently breaks make_names.pl in
-+# WebCore. Investigating whether make_names.pl should be changed instead is left as an exercise to
-+# the reader.
- IF (MSVC)
-     # FIXME: Some codegenerators don't support paths with spaces. So use the executable name only.
-     GET_FILENAME_COMPONENT(CODE_GENERATOR_PREPROCESSOR_EXECUTABLE ${CMAKE_CXX_COMPILER} NAME)
-     SET(CODE_GENERATOR_PREPROCESSOR "${CODE_GENERATOR_PREPROCESSOR_EXECUTABLE} /nologo /EP")
-+    SET(CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS "${CODE_GENERATOR_PREPROCESSOR}")
- ELSEIF (CMAKE_SYSTEM_NAME MATCHES QNX)
-     SET(CODE_GENERATOR_PREPROCESSOR "${CMAKE_CXX_COMPILER} -E -Wp,-P -x c++")
-+    SET(CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS "${CODE_GENERATOR_PREPROCESSOR}")
- ELSE ()
-     SET(CODE_GENERATOR_PREPROCESSOR "${CMAKE_CXX_COMPILER} -E -P -x c++")
-+    SET(CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS "${CMAKE_CXX_COMPILER} -E -x c++")
- ENDIF ()
- 
- SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON)
-diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake
-index 3abe342..4e7ca9f 100644
---- a/Source/cmake/WebKitMacros.cmake
-+++ b/Source/cmake/WebKitMacros.cmake
-@@ -89,7 +89,7 @@ MACRO (GENERATE_DOM_NAMES _namespace _attrs)
-     ADD_CUSTOM_COMMAND(
-         OUTPUT  ${_outputfiles}
-         DEPENDS ${NAMES_GENERATOR} ${SCRIPTS_BINDINGS} ${_attrs} ${_tags}
--        COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${NAMES_GENERATOR} --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" --outputDir ${DERIVED_SOURCES_WEBCORE_DIR} ${_arguments} ${_additionArguments}
-+        COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${NAMES_GENERATOR} --preprocessor "${CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS}" --outputDir ${DERIVED_SOURCES_WEBCORE_DIR} ${_arguments} ${_additionArguments}
-         VERBATIM)
- ENDMACRO ()
- 
--- 
-1.7.7
-

deleted file mode 100644
index 6958b9e..0000000
@@ -1,28 +0,0 @@
-From 079acc344dc12818d8b56bf80a42065d8429f7ef Mon Sep 17 00:00:00 2001
-From: Martin Jansa <[email protected]>
-Date: Tue, 14 Feb 2012 09:56:53 +0100
-Subject: [PATCH] JavaScriptCore: add EINA_LIBRARIES to shell build for Efl
-
-* needed for libwtf_efl
-* otherwise fails with ../wtf/libwtf_efl.so.0.1.0: error: undefined reference to 'eina_module_free'
-
-Signed-off-by: Martin Jansa <[email protected]>
----
- Source/JavaScriptCore/shell/PlatformEfl.cmake |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/Source/JavaScriptCore/shell/PlatformEfl.cmake b/Source/JavaScriptCore/shell/PlatformEfl.cmake
-index c35af2d..ef3f437 100644
---- a/Source/JavaScriptCore/shell/PlatformEfl.cmake
-+++ b/Source/JavaScriptCore/shell/PlatformEfl.cmake
-@@ -1,6 +1,7 @@
- LIST(APPEND JSC_LIBRARIES
-     ${Glib_LIBRARIES}
-     ${ECORE_LIBRARIES}
-+    ${EINA_LIBRARIES}
-     ${CMAKE_DL_LIBS}
- )
- 
--- 
-1.7.8.4
-

index c130867..8071d61 100644
@@ -11,19 +11,15 @@ ENDIF ()
 # -----------------------------------------------------------------------------
 # Default library type
 # -----------------------------------------------------------------------------
-SET(ENABLE_WEBCORE On)
+SET(ENABLE_WEBCORE ON)
 
 IF (NOT ENABLE_WEBKIT AND NOT ENABLE_WEBKIT2)
-    SET(ENABLE_WEBKIT On)
+    SET(ENABLE_WEBKIT ON)
 ENDIF ()
 
-OPTION(ONLY_BUILD_JAVASCRIPTCORE "only build JavaScriptCore")
-IF (ONLY_BUILD_JAVASCRIPTCORE)
-    SET(ENABLE_WEBCORE Off)
-    SET(ENABLE_WEBKIT Off)
-    SET(ENABLE_WEBKIT2 Off)
-ENDIF ()
+SET(ENABLE_TOOLS ON)
 
+SET(WTF_DIR "${CMAKE_SOURCE_DIR}/Source/WTF")
 SET(JAVASCRIPTCORE_DIR "${CMAKE_SOURCE_DIR}/Source/JavaScriptCore")
 SET(WEBCORE_DIR "${CMAKE_SOURCE_DIR}/Source/WebCore")
 SET(WEBKIT_DIR "${CMAKE_SOURCE_DIR}/Source/WebKit")

@@ -35,10 +31,15 @@ SET(TOOLS_DIR "${CMAKE_SOURCE_DIR}/Tools")
 SET(DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources")
 SET(DERIVED_SOURCES_JAVASCRIPTCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/JavaScriptCore")
 SET(DERIVED_SOURCES_WEBCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebCore")
+SET(DERIVED_SOURCES_WEBKIT_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit")
 SET(DERIVED_SOURCES_WEBKIT2_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit2")
 
 SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/Source/cmake")
 
+SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+
 INCLUDE(WebKitMacros)
 INCLUDE(WebKitFS)
 INCLUDE(WebKitHelpers)

@@ -109,24 +110,24 @@ SET(JavaScriptCore_LIBRARY_NAME JavaScriptCore)
 SET(WebCore_LIBRARY_NAME WebCore)
 SET(WebKit_LIBRARY_NAME WebKit)
 SET(WebKit2_LIBRARY_NAME WebKit2)
+SET(WebCoreTestSupport_LIBRARY_NAME WebCoreTestSupport)
 
 # -----------------------------------------------------------------------------
 # Default library types
 # -----------------------------------------------------------------------------
-OPTION(SHARED_CORE "build WTF, JavaScriptCore and WebCore as shared libraries")
+OPTION(SHARED_CORE "build JavaScriptCore and WebCore as shared libraries")
 
 IF (SHARED_CORE)
-    SET(WTF_LIBRARY_TYPE SHARED)
     SET(JavaScriptCore_LIBRARY_TYPE SHARED)
     SET(WebCore_LIBRARY_TYPE SHARED)
 ELSE ()
-    SET(WTF_LIBRARY_TYPE STATIC)
     SET(JavaScriptCore_LIBRARY_TYPE STATIC)
     SET(WebCore_LIBRARY_TYPE STATIC)
 ENDIF ()
 
 SET(WebKit_LIBRARY_TYPE SHARED)
 SET(WebKit2_LIBRARY_TYPE SHARED)
+SET(WebCoreTestSupport_LIBRARY_TYPE STATIC)
 
 # -----------------------------------------------------------------------------
 # Port-specific options

@@ -135,6 +136,13 @@ INCLUDE(OptionsCommon)
 INCLUDE(Options${PORT})
 
 # -----------------------------------------------------------------------------
+# Enable API unit tests and create a target for the test runner
+# -----------------------------------------------------------------------------
+IF (ENABLE_API_TESTS)
+    ENABLE_TESTING()
+ENDIF ()
+
+# -----------------------------------------------------------------------------
 # Install JavaScript shell
 # -----------------------------------------------------------------------------
 OPTION(SHOULD_INSTALL_JS_SHELL "generate an installation rule to install the built JavaScript shell")

@@ -152,9 +160,7 @@ ADD_SUBDIRECTORY(Source)
 # -----------------------------------------------------------------------------
 # Add tools
 # -----------------------------------------------------------------------------
-ADD_SUBDIRECTORY(Tools)
+IF (ENABLE_TOOLS)
+    ADD_SUBDIRECTORY(Tools)
+ENDIF ()
 
-# -----------------------------------------------------------------------------
-# Prints a summary of all enabled/disabled features
-# -----------------------------------------------------------------------------
-WEBKIT_PRINT_FEATURES()

index 7719212..7a7b9bd 100644
@@ -9,9 +9,10 @@ DEPENDS = "icu libxslt sqlite3 gperf-native bison-native flex-native jpeg \
            libpng libxt fontconfig cairo freetype glib-2.0 libsoup-2.4 \
            libxml2 pango eina ecore evas edje"
 
-SRCREV = "105069"
-PV = "1.7.3+svnr${SRCPV}"
-PR = "r3"
+# 120145 and 122103 introduces dependency on libsoup-2.39.3 and glib-networking-2.33.2
+SRCREV = "120144"
+PV = "1.9.3+svnr${SRCPV}"
+PR = "r1"
 
 SRCREV_FORMAT = "source"
 

@@ -19,8 +20,6 @@ SRC_URI = "\
   svn://svn.webkit.org/repository/webkit/trunk;module=Source;name=source;protocol=http;subdir=src \
   svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitLibraries;protocol=http;subdir=src \
   svn://svn.webkit.org/repository/webkit/trunk/;module=Tools;protocol=http;subdir=src \
-  file://0001-JavaScriptCore-add-EINA_LIBRARIES-to-shell-build-for.patch \
-  file://0001-CMake-Do-not-pass-P-to-the-preprocessor-when-running.patch \
   file://CMakeLists.txt \
 "
 

@@ -34,7 +33,7 @@ inherit cmake lib_package pkgconfig perlnative pythonnative
 
 ARM_INSTRUCTION_SET = "arm"
 
-EXTRA_OECMAKE = "-DPORT=Efl -DSHARED_CORE=ON"
+EXTRA_OECMAKE = "-DPORT=Efl -DSHARED_CORE=On -DENABLE_DRAG_SUPPORT=On"
 
 LEAD_SONAME = "libewebkit.so"
 PACKAGES =+ "${PN}launcher-dbg ${PN}launcher"

new file mode 100644
index 0000000..a1f14df
@@ -0,0 +1,38 @@
+From 7c25cbf1901e9be1c0bebca6c9bcaa79dbbdf849 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <[email protected]>
+Date: Wed, 18 Jul 2012 17:54:50 +0200
+Subject: [PATCH] eve: update for newer webkit-efl
+
+* ewk_settings_icon_database_icon_object_add was renamed to ewk_settings_icon_database_icon_object_get
+  in webkit r113173 (see https://bugs.webkit.org/show_bug.cgi?id=82438)
+
+Signed-off-by: Martin Jansa <[email protected]>
+---
+ src/bin/chrome.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/bin/chrome.c b/src/bin/chrome.c
+index e402cad..ee8f0c4 100644
+--- a/src/bin/chrome.c
++++ b/src/bin/chrome.c
+@@ -985,7 +985,7 @@ _chrome_state_apply(Evas_Object *chrome, Evas_Object *view)
+    if (old_icon) evas_object_del(old_icon);
+    if (url)
+      {
+-        favicon = ewk_settings_icon_database_icon_object_add(url, canvas);
++        favicon = ewk_settings_icon_database_icon_object_get(url, canvas);
+         if (favicon)
+            elm_object_part_content_set(text_url, "icon", favicon);
+      }
+@@ -2456,7 +2456,7 @@ more_content_get(void *data, Evas_Object *obj, const char *part)
+           {
+              Evas_Object *chrome = evas_object_data_get(obj, "chrome");
+              Evas *canvas = evas_object_evas_get(chrome);
+-             icon = ewk_settings_icon_database_icon_object_add(mmi->next, canvas);
++             icon = ewk_settings_icon_database_icon_object_get(mmi->next, canvas);
+           }
+         return icon;
+      }
+-- 
+1.7.8.6
+

index d760c4a..9528ff3 100644
@@ -3,6 +3,7 @@ LICENSE = "LGPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6"
 DEPENDS = "evas ecore edje elementary webkit-efl"
 PV = "0.3.0.0+svnr${SRCPV}"
+PR = "r1"
 SRCREV = "${EFL_SRCREV}"
 
 inherit e gettext

@@ -14,6 +15,7 @@ do_configure_prepend() {
 }
 
 SRC_URI += "file://eve-theme-for-smaller-screens.patch \
+  file://0001-eve-update-for-newer-webkit-efl.patch \
 "
 
 EXTRA_OECONF = "\

index 852bbcc..6f5fab1 100644
@@ -4,7 +4,7 @@ LICENSE = "MIT BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=2667a0f4120372ea91f7467cdff4095f"
 SRCNAME = "e"
 PV = "0.16.999.060+svnr${SRCPV}"
-PR = "r1"
+PR = "r2"
 SRCREV = "${EFL_SRCREV}"
 
 inherit e update-alternatives gettext

@@ -182,7 +182,6 @@ FILES_${PN}-doc += "\
 CONFFILES_${PN}-menu = "${sysconfdir}/xdg/menus/applications.menu"
 CONFFILES_${PN}-sysactions = "/etc/enlightenment/sysactions.conf"
 
-ALTERNATIVE_PATH = "${bindir}/enlightenment_start.oe"
-ALTERNATIVE_NAME = "x-window-manager"
-ALTERNATIVE_LINK = "${bindir}/x-window-manager"
-ALTERNATIVE_PRIORITY = "16"
+ALTERNATIVE_${PN} = "x-window-manager"
+ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/enlightenment_start.oe"
+ALTERNATIVE_PRIORITY[x-window-manager] = "16"

index 568d492..1e3ac0c 100644
@@ -2,10 +2,10 @@ DESCRIPTION = "A TCP/IP Daemon simplifying the communication with GPS devices"
 SECTION = "console/network"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800"
-DEPENDS = "dbus dbus-glib ncurses python libusb1"
+DEPENDS = "dbus dbus-glib ncurses python libusb1 chrpath-native"
 PROVIDES = "virtual/gpsd"
 
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \
   file://0001-SConstruct-respect-sysroot-setting-when-prepending-L.patch \

index 8404ba1..380f3ba 100644
@@ -2,10 +2,10 @@ DESCRIPTION = "A TCP/IP Daemon simplifying the communication with GPS devices"
 SECTION = "console/network"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800"
-DEPENDS = "dbus dbus-glib ncurses python libusb1"
+DEPENDS = "dbus dbus-glib ncurses python libusb1 chrpath-native"
 PROVIDES = "virtual/gpsd"
 
-PR = "r3"
+PR = "r4"
 
 SRCREV = "f8744f4af8cef211de698df5d8e6caddfe33f29d"
 

deleted file mode 100644
index 7f9ca85..0000000
@@ -1,36 +0,0 @@
-DESCRIPTION = "Extra udev rules"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
-
-inherit allarch
-
-PR = "r4"
-
-SRC_URI = " \
-       file://automount.rules \
-       file://mount.sh \
-       file://mount.blacklist \
-       file://autonet.rules \
-       file://network.sh \
-       file://local.rules \
-"
-
-
-do_install() {
-    install -d ${D}${sysconfdir}/udev/rules.d
-
-    install -m 0644 ${WORKDIR}/automount.rules     ${D}${sysconfdir}/udev/rules.d/automount.rules
-    install -m 0644 ${WORKDIR}/autonet.rules       ${D}${sysconfdir}/udev/rules.d/autonet.rules
-    install -m 0644 ${WORKDIR}/local.rules         ${D}${sysconfdir}/udev/rules.d/local.rules
-
-    install -m 0644 ${WORKDIR}/mount.blacklist     ${D}${sysconfdir}/udev/
-
-    install -d ${D}${sysconfdir}/udev/scripts/
-
-    install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh
-    install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts
-}
-
-FILES_${PN} = "${sysconfdir}/udev"
-RDEPENDS_${PN} = "udev"
-CONFFILES_${PN} = "${sysconfdir}/udev/mount.blacklist"

deleted file mode 100644
index 7e844c3..0000000
@@ -1,19 +0,0 @@
-# There are a number of modifiers that are allowed to be used in some
-# of the different fields. They provide the following subsitutions:
-#
-# %n the "kernel number" of the device.
-#    For example, 'sda3' has a "kernel number" of '3'
-# %e the smallest number for that name which does not matches an existing node
-# %k the kernel name for the device
-# %M the kernel major number for the device
-# %m the kernel minor number for the device
-# %b the bus id for the device
-# %c the string returned by the PROGRAM
-# %s{filename} the content of a sysfs attribute
-# %% the '%' char itself
-#
-
-# Media automounting
-SUBSYSTEM=="block", ACTION=="add"    RUN+="/etc/udev/scripts/mount.sh"
-SUBSYSTEM=="block", ACTION=="remove" RUN+="/etc/udev/scripts/mount.sh"
-

deleted file mode 100644
index 19676aa..0000000
@@ -1,19 +0,0 @@
-# There are a number of modifiers that are allowed to be used in some
-# of the different fields. They provide the following subsitutions:
-#
-# %n the "kernel number" of the device.
-#    For example, 'sda3' has a "kernel number" of '3'
-# %e the smallest number for that name which does not matches an existing node
-# %k the kernel name for the device
-# %M the kernel major number for the device
-# %m the kernel minor number for the device
-# %b the bus id for the device
-# %c the string returned by the PROGRAM
-# %s{filename} the content of a sysfs attribute
-# %% the '%' char itself
-#
-
-# Handle network interface setup
-SUBSYSTEM=="net", ACTION=="add" RUN+="/etc/udev/scripts/network.sh"
-SUBSYSTEM=="net", ACTION=="remove" RUN+="/etc/udev/scripts/network.sh"
-

deleted file mode 100644
index 4eaa8ca..0000000
@@ -1,21 +0,0 @@
-# There are a number of modifiers that are allowed to be used in some
-# of the different fields. They provide the following subsitutions:
-#
-# %n the "kernel number" of the device.
-#    For example, 'sda3' has a "kernel number" of '3'
-# %e the smallest number for that name which does not matches an existing node
-# %k the kernel name for the device
-# %M the kernel major number for the device
-# %m the kernel minor number for the device
-# %b the bus id for the device
-# %c the string returned by the PROGRAM
-# %s{filename} the content of a sysfs attribute
-# %% the '%' char itself
-#
-
-# The first rtc device is symlinked to /dev/rtc
-KERNEL=="rtc0", SYMLINK+="rtc"
-
-#The first framebuffer is symlinked to /dev/fb
-KERNEL=="fb0",  SYMLINK+="fb"
-

deleted file mode 100644
index d3ebb17..0000000
@@ -1,3 +0,0 @@
-/dev/loop
-/dev/ram
-/dev/mtdblock

64 lines not on this page · raw message

58 lines not on this page · raw message

index d3f6e1b..0923575 100644
@@ -15,4 +15,5 @@ EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
 
 FILES_${PN} += "${libdir}/enlightenment/modules/${PN}"
 FILES_${PN}-dbg += "${libdir}/enlightenment/modules/${PN}/*/.debug"
+FILES_${PN}-staticdev += "${libdir}/enlightenment/modules/${PN}/*/*.a"
 

new file mode 100644
index 0000000..51f703c
@@ -0,0 +1,44 @@
+Upstream-Status: Backport
+
+It's fixed in 4.6 and 4.7(HEAD)
+
+http://sourceforge.net/tracker/?func=detail&aid=3523591&group_id=2055&atid=102055
+
+diff -uNr gnuplot-4.4.4.orig/Makefile.am gnuplot-4.4.4/Makefile.am
+--- gnuplot-4.4.4.orig/Makefile.am	2012-07-20 10:54:49.075828905 +0200
++++ gnuplot-4.4.4/Makefile.am	2012-07-20 10:55:22.380831313 +0200
+@@ -1,5 +1,5 @@
+ ## Process this file with automake to produce Makefile.in -*-Makefile-*-
+-AUTOMAKE_OPTIONS = foreign 1.2h
++AUTOMAKE_OPTIONS = foreign
+ 
+ SUBDIRS = config m4 term src  $(LISPDIR) man share
+ 
+diff -uNr gnuplot-4.4.4.orig/configure.in gnuplot-4.4.4/configure.in
+--- gnuplot-4.4.4.orig/configure.in	2011-09-02 06:09:40.000000000 +0200
++++ gnuplot-4.4.4/configure.in	2012-07-20 10:55:53.289833224 +0200
+@@ -16,10 +16,11 @@
+ dnl configure.in body
+ 
+ dnl Compiler characteristics
+-dnl Check for ANSI C prototypes, the const and inline keywords,
+-dnl and ANSI style stringification
++dnl Check for the const and inline keywords and ANSI style stringification
++dnl automake 1.12 dropped support for AM_C_PROTOTYPES and ansi2knr
++dnl But our code still tests for #ifdef PROTOTYPES, so define it here
++AC_DEFINE(PROTOTYPES,1,[Automake 1.12 dropped support for building without prototypes])
+ AC_PROG_CC
+-AM_C_PROTOTYPES
+ AC_PROG_CPP
+ AC_C_CONST
+ AC_C_INLINE
+diff -uNr gnuplot-4.4.4.orig/src/Makefile.am gnuplot-4.4.4/src/Makefile.am
+--- gnuplot-4.4.4.orig/src/Makefile.am	2010-10-06 06:53:16.000000000 +0200
++++ gnuplot-4.4.4/src/Makefile.am	2012-07-20 10:56:02.376834548 +0200
+@@ -1,5 +1,5 @@
+ ## Process this file with automake to produce Makefile.in -*-Makefile-*-
+-AUTOMAKE_OPTIONS = ansi2knr foreign 1.2h
++AUTOMAKE_OPTIONS = foreign
+ 
+ # in the spirit of automake ...
+ pkglibexecdir = $(libexecdir)/@PACKAGE@/@VERSION_MAJOR@

new file mode 100644
index 0000000..8c7d1f0
@@ -0,0 +1,11 @@
+--- /tmp/Makefile.am	2007-08-23 13:10:15.560659023 +0200
++++ gnuplot-4.2.0/Makefile.am	2007-08-23 13:10:34.961764629 +0200
+@@ -1,7 +1,7 @@
+ ## Process this file with automake to produce Makefile.in -*-Makefile-*-
+ AUTOMAKE_OPTIONS = foreign 1.2h
+ 
+-SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share
++SUBDIRS = config m4 term src  $(LISPDIR) man share
+ 
+ EXTRA_DIST = BUGS CodeStyle Copyright FAQ GNUmakefile INSTALL INSTALL.gnu \
+ Makefile.maint PATCHLEVEL PGPKEYS PORTING README README.1ST README.exp \

new file mode 100644
index 0000000..b72bbd7
@@ -0,0 +1,35 @@
+DESCRIPTION = "Gnuplot is a portable command-line driven interactive datafile \
+(text or binary) and function plotting utility."
+HOMEPAGE = "http://www.gnuplot.info/"
+SECTION = "console/scientific"
+LICENSE = "BSD-4"
+LIC_FILES_CHKSUM = "file://Copyright;md5=243a186fc2fd3b992125d60d5b1bab8f"
+DEPENDS = "virtual/libx11 gd cairo readline"
+
+inherit autotools
+
+acpaths = ""
+
+EXTRA_OECONF = "--with-readline=${STAGING_LIBDIR}/.. \
+                --without-lisp-files \
+                --without-tutorial \
+                --disable-wxwidgets"
+
+do_compile_prepend() {
+    install -m 0644 ${WORKDIR}/qtplot-0.2/qtopia.trm ${S}/term/
+}
+
+do_install_append() {
+    install -d ${D}${datadir}/applications/
+    install -m 0644 ${WORKDIR}/gnuplot.desktop ${D}${datadir}/applications/
+    install -d ${D}${datadir}/pixmaps/
+    install -m 0644 ${WORKDIR}/gnuplot.png ${D}${datadir}/pixmaps/
+}
+
+PACKAGES =+ "${PN}-x11-dbg ${PN}-x11"
+DESCRIPTION_${PN}-x11 = "X11 display terminal for Gnuplot."
+SECTION_${PN}-x11 = "x11/scientific"
+FILES_${PN}-x11 = "${libexecdir} ${datadir}/applications ${datadir}/pixmaps ${libdir}/X11 "
+
+FILES_${PN} += "${datadir}/texmf"
+FILES_${PN}-x11-dbg += "${libexecdir}/gnuplot/*/.debug"

new file mode 100644
index 0000000..f67df9e
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Gnuplot
+Comment=Plot data and function graphs
+Exec=x-terminal-emulator -e gnuplot
+Terminal=false
+Type=Application
+Icon=gnuplot
+Categories=Science;

new file mode 100644
index 0000000000000000000000000000000000000000..054cd9e7c73f2a78a9f2dd91ef8cce52ac520389
GIT binary patch

483 lines not on this page · raw message

new file mode 100644
index 0000000..d922afc
@@ -0,0 +1,16 @@
+require gnuplot.inc
+
+PR = "r1"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/gnuplot/${PN}-${PV}.tar.gz;name=archive \
+   http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz;name=qtplot \
+   file://subdirs.patch \
+   file://gnuplot.desktop \
+   file://gnuplot.png \
+   file://automake-1.12.x.patch \
+"
+
+SRC_URI[archive.md5sum] = "97a43328e81e57ebed7f135ca0c07e82"
+SRC_URI[archive.sha256sum] = "d228599d08d5f87bcb79af8af8bb432c77d942802b1643f920c7baaeaf1ddbfd"
+SRC_URI[qtplot.md5sum] = "0a481885a496092c77eb4017540b5cf6"
+SRC_URI[qtplot.sha256sum] = "6df317183ff62cc82f3dcf88207a267cd6478cb5147f55d7530c94f1ad5f4132"

new file mode 100644
index 0000000..d05967d
@@ -0,0 +1,12 @@
+Index: libetpan-0.57/configure.ac
+===================================================================
+--- libetpan-0.57.orig/configure.ac	2008-10-08 19:54:20.000000000 +0000
++++ libetpan-0.57/configure.ac	2008-11-11 16:34:33.000000000 +0000
+@@ -106,6 +106,7 @@
+ 
+ # Check the C compiler.
+ AC_PROG_CC
++AC_PROG_CXX
+ 
+ # Compiler flags.
+ AC_ARG_ENABLE(debug,   [  --enable-debug          setup flags (gcc) for debugging (default=no)],

new file mode 100644
index 0000000..438f44f
@@ -0,0 +1,11 @@
+--- libetpan-0.57/configure.ac~	2009-09-21 23:31:42.000000000 +0200
++++ libetpan-0.57/configure.ac	2009-09-21 23:31:42.000000000 +0200
+@@ -457,7 +457,7 @@
+       LDFLAGS="-$flag $LDFLAGS"
+       AC_TRY_LINK([], [pthread_create();], 
+                       [pthflag=yes; checkpthread=no], 
+-                      [pthflag=no; LDFLAGS="$OLDCFLAGS"])
++                      [pthflag=no; LDFLAGS="$OLDFLAGS"])
+       AC_MSG_RESULT($pthflag)
+     fi
+   done

new file mode 100644
index 0000000..7049938
@@ -0,0 +1,24 @@
+DESCRIPTION = "libetpan is a library for communicating with mail and news servers. \
+It supports the protocols SMTP, POP3, IMAP and NNTP."
+HOMEPAGE = "http://www.etpan.org"
+SECTION = "libs"
+DEPENDS = "gnutls"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=f18ebe7e452708c26f83954f81062ba7"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/libetpan/libetpan-${PV}.tar.gz \
+           file://libetpan-autoreconf.patch \
+           file://libetpan-ldflags.patch"
+
+inherit autotools pkgconfig gettext binconfig
+
+EXTRA_OECONF = "--without-openssl --with-gnutls --disable-db"
+
+PARALLEL_MAKE = ""
+
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev = "${bindir} ${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libdir}/*.a ${libdir}/pkgconfig"
+
+
+SRC_URI[md5sum] = "8ce8c6c071e81884a475b12b7f9a9cc0"
+SRC_URI[sha256sum] = "1f3fda5c9e2961d1a6298dc8aadae321493d37727d8db45bc2e8d58f20547011"

new file mode 100644
index 0000000..17c213d
@@ -0,0 +1,575 @@
+http://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=1773
+
+However using if (g_utf8_collate(foo1, foo2)) works and gives good results (at
+least if glibc or locale data are not broken), this usage is bad.
+
+If you need to just compare strings to get equal/non-equal return value, than
+using of four-pass locale wise lexicographic collating is purely superfluous.
+
+Using simpler functions like strcmp() or g_strcmp0() will give the same result
+5-50 times faster.
+
+In attached patch, I replaces all occurrences of upper mentioned use case.
+
+Stanislav Brabec
+
+diff -ur claws-mail-3.6.1.orig/src/addrcustomattr.c claws-mail-3.6.1/src/addrcustomattr.c
+--- claws-mail-3.6.1.orig/src/addrcustomattr.c	2008-07-25 23:01:29.000000000 +0200
++++ claws-mail-3.6.1/src/addrcustomattr.c	2008-11-14 14:27:12.000000000 +0100
+@@ -353,7 +353,7 @@
+ 	gchar *attr;
+ 	gtk_tree_model_get(model, iter, CUSTOM_ATTR_NAME, &attr, -1);
+ 
+-	if (g_utf8_collate(data->attr, attr)==0) {
++	if (g_strcmp0(data->attr, attr)==0) {
+ 		data->path = path; /* signal we found it */
+ 		data->iter = *iter;
+ 		return TRUE;
+diff -ur claws-mail-3.6.1.orig/src/addressbook_foldersel.c claws-mail-3.6.1/src/addressbook_foldersel.c
+--- claws-mail-3.6.1.orig/src/addressbook_foldersel.c	2008-09-09 19:10:50.000000000 +0200
++++ claws-mail-3.6.1/src/addressbook_foldersel.c	2008-11-14 14:27:12.000000000 +0100
+@@ -392,12 +392,19 @@
+        corresponds to what we received */
+ 
+ 	if ( path != NULL ) {
+-		if ( g_utf8_collate(path, _("Any")) == 0 || strcasecmp(path, "Any") ==0 || *path == '\0' )
++		/* FIXME: Do we really need to recognize "anY" (and translated form)? */
++		/* It's a bit more complicated than g_utf8_collate, but still much faster */
++		char *tmp1, *tmp2;
++		tmp1 = g_utf8_casefold(path, -1);
++		tmp2 = g_utf8_casefold(_("Any"), -1); /* FIXME: This should be done only once. */
++		if ( g_strcmp0(tmp1, tmp2) == 0 || g_ascii_strcasecmp(path, "Any") ==0 || *path == '\0' )
+ 			/* consider "Any" (both translated or untranslated forms) and ""
+ 			   as valid addressbook roots */
+ 			folder_path_match.matched = TRUE;
+ 		else
+ 			folder_path_match.folder_path = g_strsplit( path, "/", 256 );
++		g_free(tmp1);
++		g_free(tmp2);
+ 	}
+ 
+ 	addressbook_foldersel_load_data( addrIndex, &folder_path_match );
+diff -ur claws-mail-3.6.1.orig/src/addrgather.c claws-mail-3.6.1/src/addrgather.c
+--- claws-mail-3.6.1.orig/src/addrgather.c	2008-09-09 19:10:50.000000000 +0200
++++ claws-mail-3.6.1/src/addrgather.c	2008-11-14 14:27:12.000000000 +0100
+@@ -507,7 +507,7 @@
+ 	for (i = 0; i < NUM_FIELDS; i++) {
+ 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(addrgather_dlg.checkHeader[i]),
+ 					     FALSE);
+-		if (g_utf8_collate(_harv_headerNames_[i], HEADER_FROM) == 0)
++		if (g_strcmp0(_harv_headerNames_[i], HEADER_FROM) == 0)
+ 			gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(addrgather_dlg.checkHeader[i]),
+ 						    TRUE);
+ 	}
+diff -ur claws-mail-3.6.1.orig/src/common/mgutils.c claws-mail-3.6.1/src/common/mgutils.c
+--- claws-mail-3.6.1.orig/src/common/mgutils.c	2007-10-15 19:19:53.000000000 +0200
++++ claws-mail-3.6.1/src/common/mgutils.c	2008-11-14 14:27:12.000000000 +0100
+@@ -356,7 +356,7 @@
+ 		if( strlen( str ) > 0 ) {
+ 			node = list;
+ 			while( node ) {
+-				if( g_utf8_collate( str, node->data ) == 0 )
++				if( g_strcmp0( str, node->data ) == 0 )
+ 					return FALSE;
+ 				node = g_slist_next( node );
+ 			}
+@@ -380,7 +380,7 @@
+ 		if( strlen( str ) > 0 ) {
+ 			node = list;
+ 			while( node ) {
+-				if( g_utf8_collate( str, node->data ) == 0 )
++				if( g_strcmp0( str, node->data ) == 0 )
+ 					return FALSE;
+ 				node = g_list_next( node );
+ 			}
+diff -ur claws-mail-3.6.1.orig/src/compose.c claws-mail-3.6.1/src/compose.c
+--- claws-mail-3.6.1.orig/src/compose.c	2008-10-04 12:58:45.000000000 +0200
++++ claws-mail-3.6.1/src/compose.c	2008-11-14 14:27:12.000000000 +0100
+@@ -2399,7 +2399,7 @@
+ 	for (h_list = compose->header_list; h_list != NULL; h_list = h_list->next) {
+ 		entry = GTK_ENTRY(((ComposeHeaderEntry *)h_list->data)->entry);
+ 		if (gtk_entry_get_text(entry) && 
+-		    !g_utf8_collate(gtk_entry_get_text(entry), mailto)) {
++		    !g_strcmp0(gtk_entry_get_text(entry), mailto)) {
+ 			if (yellow_initialised) {
+ 				gtk_widget_modify_base(
+ 					GTK_WIDGET(((ComposeHeaderEntry *)h_list->data)->entry),
+@@ -4858,7 +4858,7 @@
+ 		headerentry = ((ComposeHeaderEntry *)list->data);
+ 		headerentryname = gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((headerentry->combo)))));
+ 
+-		if (g_utf8_collate(headerentryname, to_hdr) == 0) {
++		if (g_strcmp0(headerentryname, to_hdr) == 0) {
+ 			const gchar *entstr = gtk_entry_get_text(GTK_ENTRY(headerentry->entry));
+ 			Xstrdup_a(str, entstr, return -1);
+ 			g_strstrip(str);
+@@ -4886,7 +4886,7 @@
+ 		headerentry = ((ComposeHeaderEntry *)list->data);
+ 		headerentryname = gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((headerentry->combo)))));
+ 
+-		if (g_utf8_collate(headerentryname, cc_hdr) == 0) {
++		if (g_strcmp0(headerentryname, cc_hdr) == 0) {
+ 			const gchar *strg = gtk_entry_get_text(GTK_ENTRY(headerentry->entry));
+ 			Xstrdup_a(str, strg, return -1);
+ 			g_strstrip(str);
+@@ -5760,7 +5760,7 @@
+     		headerentry = ((ComposeHeaderEntry *)list->data);
+ 		headerentryname = gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((headerentry->combo)))));
+ 
+-		if (!g_utf8_collate(trans_fieldname, headerentryname)) {
++		if (!g_strcmp0(trans_fieldname, headerentryname)) {
+ 			str = gtk_editable_get_chars(GTK_EDITABLE(headerentry->entry), 0, -1);
+ 			g_strstrip(str);
+ 			if (str[0] != '\0') {
+diff -ur claws-mail-3.6.1.orig/src/customheader.c claws-mail-3.6.1/src/customheader.c
+--- claws-mail-3.6.1.orig/src/customheader.c	2007-07-11 18:33:01.000000000 +0200
++++ claws-mail-3.6.1/src/customheader.c	2008-11-14 14:27:12.000000000 +0100
+@@ -83,7 +83,7 @@
+ 
+ 	for (cur = header_list; cur != NULL; cur = cur->next) {
+ 		chdr = (CustomHeader *)cur->data;
+-		if (!g_utf8_collate(chdr->name, header))
++		if (!g_strcmp0(chdr->name, header))
+ 			return chdr;
+ 	}
+ 
+diff -ur claws-mail-3.6.1.orig/src/exportldif.c claws-mail-3.6.1/src/exportldif.c
+--- claws-mail-3.6.1.orig/src/exportldif.c	2007-10-04 19:36:26.000000000 +0200
++++ claws-mail-3.6.1/src/exportldif.c	2008-11-14 14:27:12.000000000 +0100
+@@ -275,7 +275,7 @@
+ 		UserAttribute *attrib = node->data;
+ 
+ 		node = g_list_next( node );
+-		if( g_utf8_collate( attrib->name, LDIF_TAG_DN ) == 0 ) {
++		if( g_strcmp0( attrib->name, LDIF_TAG_DN ) == 0 ) {
+ 			retVal = g_strdup( attrib->value );
+ 			break;
+ 		}
+diff -ur claws-mail-3.6.1.orig/src/gtk/combobox.c claws-mail-3.6.1/src/gtk/combobox.c
+--- claws-mail-3.6.1.orig/src/gtk/combobox.c	2008-08-29 10:37:19.000000000 +0200
++++ claws-mail-3.6.1/src/gtk/combobox.c	2008-11-14 14:27:12.000000000 +0100
+@@ -101,7 +101,7 @@
+ 	const gchar *curdata;
+ 
+ 	gtk_tree_model_get (GTK_TREE_MODEL(model), iter, 0, &curdata, -1);
+-	if (!g_utf8_collate(data, curdata)) {
++	if (!g_strcmp0(data, curdata)) {
+ 		gtk_combo_box_set_active_iter(combobox, iter);
+ 		return TRUE;
+ 	}
+diff -ur claws-mail-3.6.1.orig/src/jpilot.c claws-mail-3.6.1/src/jpilot.c
+--- claws-mail-3.6.1.orig/src/jpilot.c	2008-10-01 09:10:29.000000000 +0200
++++ claws-mail-3.6.1/src/jpilot.c	2008-11-14 14:27:12.000000000 +0100
+@@ -1322,7 +1322,7 @@
+ 					}
+ 				}
+ 
+-				if( g_utf8_collate( labelName, lbl ) == 0 ) {
++				if( g_strcmp0( labelName, lbl ) == 0 ) {
+ 					ind = i;
+ 					break;
+ 				}
+@@ -1640,7 +1640,7 @@
+ 	if( labelName ) {
+ 		node = pilotFile->customLabels;
+ 		while( node ) {
+-			if( g_utf8_collate( labelName, ( gchar * ) node->data ) == 0 ) {
++			if( g_strcmp0( labelName, ( gchar * ) node->data ) == 0 ) {
+ 				retVal = TRUE;
+ 				break;
+ 			}
+diff -ur claws-mail-3.6.1.orig/src/ldapserver.c claws-mail-3.6.1/src/ldapserver.c
+--- claws-mail-3.6.1.orig/src/ldapserver.c	2007-08-22 18:08:33.000000000 +0200
++++ claws-mail-3.6.1/src/ldapserver.c	2008-11-14 14:27:12.000000000 +0100
+@@ -437,7 +437,7 @@
+ 	/* Search backwards for query */
+ 	while( node ) {
+ 		LdapQuery *qry = node->data;
+-		if( g_utf8_collate( ADDRQUERY_SEARCHVALUE(qry), searchTerm ) == 0 ) {
++		if( g_strcmp0( ADDRQUERY_SEARCHVALUE(qry), searchTerm ) == 0 ) {
+ 			if( qry->agedFlag ) continue;
+ 			if( qry->completed ) {
+ 				/* Found */
+diff -ur claws-mail-3.6.1.orig/src/ldif.c claws-mail-3.6.1/src/ldif.c
+--- claws-mail-3.6.1.orig/src/ldif.c	2008-08-06 21:38:36.000000000 +0200
++++ claws-mail-3.6.1/src/ldif.c	2008-11-14 14:27:12.000000000 +0100
+@@ -536,19 +536,19 @@
+ 	}
+ 	g_strstrip( val );
+ 
+-	if( g_utf8_collate( nm, LDIF_TAG_COMMONNAME ) == 0 ) {
++	if( g_strcmp0( nm, LDIF_TAG_COMMONNAME ) == 0 ) {
+ 		rec->listCName = g_slist_append( rec->listCName, val );
+ 	}
+-	else if( g_utf8_collate( nm, LDIF_TAG_FIRSTNAME ) == 0 ) {
++	else if( g_strcmp0( nm, LDIF_TAG_FIRSTNAME ) == 0 ) {
+ 		rec->listFName = g_slist_append( rec->listFName, val );
+ 	}
+-	else if( g_utf8_collate( nm, LDIF_TAG_LASTNAME ) == 0 ) {
++	else if( g_strcmp0( nm, LDIF_TAG_LASTNAME ) == 0 ) {
+ 		rec->listLName = g_slist_append( rec->listLName, val );
+ 	}
+-	else if( g_utf8_collate( nm, LDIF_TAG_NICKNAME ) == 0 ) {
++	else if( g_strcmp0( nm, LDIF_TAG_NICKNAME ) == 0 ) {
+ 		rec->listNName = g_slist_append( rec->listNName, val );
+ 	}
+-	else if( g_utf8_collate( nm, LDIF_TAG_EMAIL ) == 0 ) {
++	else if( g_strcmp0( nm, LDIF_TAG_EMAIL ) == 0 ) {
+ 		rec->listAddress = g_slist_append( rec->listAddress, val );
+ 	}
+ 	else {
+@@ -759,27 +759,27 @@
+ 			gchar *key = g_strdup( tag );
+ 
+ 			rec = ldif_create_fieldrec( tag );
+-			if( g_utf8_collate( tag, LDIF_TAG_DN ) == 0 ) {
++			if( g_strcmp0( tag, LDIF_TAG_DN ) == 0 ) {
+ 				rec->reserved = rec->selected = TRUE;
+ 				rec->userName = g_strdup( "dn" );
+ 			}
+-			else if( g_utf8_collate( tag, LDIF_TAG_COMMONNAME ) == 0 ) {
++			else if( g_strcmp0( tag, LDIF_TAG_COMMONNAME ) == 0 ) {
+ 				rec->reserved = rec->selected = TRUE;
+ 				rec->userName = g_strdup( _( "Display Name" ) );
+ 			}
+-			else if( g_utf8_collate( tag, LDIF_TAG_FIRSTNAME ) == 0 ) {
++			else if( g_strcmp0( tag, LDIF_TAG_FIRSTNAME ) == 0 ) {
+ 				rec->reserved = rec->selected = TRUE;
+ 				rec->userName = g_strdup( _( "First Name" ) );
+ 			}
+-			else if( g_utf8_collate( tag, LDIF_TAG_LASTNAME ) == 0 ) {
++			else if( g_strcmp0( tag, LDIF_TAG_LASTNAME ) == 0 ) {
+ 				rec->reserved = rec->selected = TRUE;
+ 				rec->userName = g_strdup( _( "Last Name" ) );
+ 			}
+-			else if( g_utf8_collate( tag, LDIF_TAG_NICKNAME ) == 0 ) {
++			else if( g_strcmp0( tag, LDIF_TAG_NICKNAME ) == 0 ) {
+ 				rec->reserved = rec->selected = TRUE;
+ 				rec->userName = g_strdup( _( "Nick Name" ) );
+ 			}
+-			else if( g_utf8_collate( tag, LDIF_TAG_EMAIL ) == 0 ) {
++			else if( g_strcmp0( tag, LDIF_TAG_EMAIL ) == 0 ) {
+ 				rec->reserved = rec->selected = TRUE;
+ 				rec->userName = g_strdup( _( "Email Address" ) );
+ 			}
+@@ -894,7 +894,7 @@
+ 					/* Add tag to list */
+ 					listTags = g_slist_append( listTags, tagName );
+ 
+-					if( g_utf8_collate(
++					if( g_strcmp0(
+ 						tagName, LDIF_TAG_EMAIL ) == 0 )
+ 					{
+ 						flagMail = TRUE;
+diff -ur claws-mail-3.6.1.orig/src/plugins/bogofilter/bogofilter_gtk.c claws-mail-3.6.1/src/plugins/bogofilter/bogofilter_gtk.c
+--- claws-mail-3.6.1.orig/src/plugins/bogofilter/bogofilter_gtk.c	2008-09-09 19:10:52.000000000 +0200
++++ claws-mail-3.6.1/src/plugins/bogofilter/bogofilter_gtk.c	2008-11-14 14:27:12.000000000 +0100
+@@ -296,7 +296,7 @@
+ 					config->whitelist_ab_folder);
+ 		else
+ 		/* backward compatibility (when translated "Any" was stored) */
+-		if (g_utf8_collate(config->whitelist_ab_folder, _("Any")) == 0)
++		if (g_strcmp0(config->whitelist_ab_folder, _("Any")) == 0)
+ 			gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((whitelist_ab_folder_combo)))),
+ 					config->whitelist_ab_folder);
+ 		else
+@@ -373,7 +373,7 @@
+ 	config->whitelist_ab_folder = gtk_editable_get_chars(
+ 				GTK_EDITABLE(gtk_bin_get_child(GTK_BIN((page->whitelist_ab_folder_combo)))), 0, -1);
+ 	/* store UNtranslated "Any" */
+-	if (g_utf8_collate(config->whitelist_ab_folder, _("Any")) == 0) {
++	if (g_strcmp0(config->whitelist_ab_folder, _("Any")) == 0) {
+ 		g_free(config->whitelist_ab_folder);
+ 		config->whitelist_ab_folder = g_strdup("Any");
+ 	}
+diff -ur claws-mail-3.6.1.orig/src/plugins/dillo_viewer/dillo_prefs.c claws-mail-3.6.1/src/plugins/dillo_viewer/dillo_prefs.c
+--- claws-mail-3.6.1.orig/src/plugins/dillo_viewer/dillo_prefs.c	2008-08-07 18:38:59.000000000 +0200
++++ claws-mail-3.6.1/src/plugins/dillo_viewer/dillo_prefs.c	2008-11-14 14:27:12.000000000 +0100
+@@ -209,7 +209,7 @@
+ 					_("Any"));
+ 		else
+ 		/* backward compatibility (when translated "Any" was stored) */
+-		if (g_utf8_collate(dillo_prefs.whitelist_ab_folder, _("Any")) == 0)
++		if (g_strcmp0(dillo_prefs.whitelist_ab_folder, _("Any")) == 0)
+ 			gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((whitelist_ab_folder_combo)))),
+ 					dillo_prefs.whitelist_ab_folder);
+ 		else
+@@ -272,7 +272,7 @@
+ 	dillo_prefs.whitelist_ab_folder = gtk_editable_get_chars(
+ 				GTK_EDITABLE(gtk_bin_get_child(GTK_BIN((prefs_page->whitelist_ab_folder_combo)))), 0, -1);
+ 	/* store UNtranslated "Any" */
+-	if (g_utf8_collate(dillo_prefs.whitelist_ab_folder, _("Any")) == 0) {
++	if (g_strcmp0(dillo_prefs.whitelist_ab_folder, _("Any")) == 0) {
+ 		g_free(dillo_prefs.whitelist_ab_folder);
+ 		dillo_prefs.whitelist_ab_folder = g_strdup("Any");
+ 	}
+diff -ur claws-mail-3.6.1.orig/src/plugins/spamassassin/spamassassin_gtk.c claws-mail-3.6.1/src/plugins/spamassassin/spamassassin_gtk.c
+--- claws-mail-3.6.1.orig/src/plugins/spamassassin/spamassassin_gtk.c	2008-09-09 19:10:52.000000000 +0200
++++ claws-mail-3.6.1/src/plugins/spamassassin/spamassassin_gtk.c	2008-11-14 14:27:12.000000000 +0100
+@@ -480,7 +480,7 @@
+ 					config->whitelist_ab_folder);
+ 		else
+ 		/* backward compatibility (when translated "Any" was stored) */
+-		if (g_utf8_collate(config->whitelist_ab_folder, _("Any")) == 0)
++		if (g_strcmp0(config->whitelist_ab_folder, _("Any")) == 0)
+ 			gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((whitelist_ab_folder_combo)))),
+ 					config->whitelist_ab_folder);
+ 		else
+@@ -603,7 +603,7 @@
+ 	config->whitelist_ab_folder = gtk_editable_get_chars(
+ 				GTK_EDITABLE(gtk_bin_get_child(GTK_BIN((page->whitelist_ab_folder_combo)))), 0, -1);
+ 	/* store UNtranslated "Any" */
+-	if (g_utf8_collate(config->whitelist_ab_folder, _("Any")) == 0) {
++	if (g_strcmp0(config->whitelist_ab_folder, _("Any")) == 0) {
+ 		g_free(config->whitelist_ab_folder);
+ 		config->whitelist_ab_folder = g_strdup("Any");
+ 	}
+diff -ur claws-mail-3.6.1.orig/src/prefs_matcher.c claws-mail-3.6.1/src/prefs_matcher.c
+--- claws-mail-3.6.1.orig/src/prefs_matcher.c	2008-10-08 20:23:51.000000000 +0200
++++ claws-mail-3.6.1/src/prefs_matcher.c	2008-11-14 14:27:12.000000000 +0100
+@@ -1484,10 +1484,10 @@
+ 		if (*expr == '\0') {
+ 			gchar *tmp;
+ 
+-			if (g_utf8_collate(header, Q_("Filtering Matcher Menu|All")) == 0)
++			if (g_strcmp0(header, Q_("Filtering Matcher Menu|All")) == 0)
+ 				tmp = g_strdup(_("all addresses in all headers"));
+ 			else
+-			if (g_utf8_collate(header, _("Any")) == 0)
++			if (g_strcmp0(header, _("Any")) == 0)
+ 				tmp = g_strdup(_("any address in any header"));
+ 			else
+ 				tmp = g_strdup_printf(_("the address(es) in header '%s'"), header);
+@@ -1499,12 +1499,12 @@
+ 		    return NULL;
+ 		}
+ 		/* store UNtranslated "Any"/"All" in matcher expressions */
+-		if (g_utf8_collate(header, Q_("Filtering Matcher Menu|All")) == 0)
++		if (g_strcmp0(header, Q_("Filtering Matcher Menu|All")) == 0)
+ 			header = "All";
+ 		else
+-			if (g_utf8_collate(header, _("Any")) == 0)
++			if (g_strcmp0(header, _("Any")) == 0)
+ 				header = "Any";
+-		if (g_utf8_collate(expr, _("Any")) == 0)
++		if (g_strcmp0(expr, _("Any")) == 0)
+ 			expr = "Any";
+ 		break;
+ 	}
+diff -ur claws-mail-3.6.1.orig/src/prefs_toolbar.c claws-mail-3.6.1/src/prefs_toolbar.c
+--- claws-mail-3.6.1.orig/src/prefs_toolbar.c	2008-09-09 19:10:50.000000000 +0200
++++ claws-mail-3.6.1/src/prefs_toolbar.c	2008-11-14 14:27:12.000000000 +0100
+@@ -391,7 +391,7 @@
+ 		gtk_tree_model_get(model_set, &iter,
+ 				   SET_EVENT, &entry, 
+ 				   -1);
+-		if (g_utf8_collate(chosen_action, entry) == 0) 
++		if (g_strcmp0(chosen_action, entry) == 0) 
+ 			result = TRUE;
+ 		g_free(entry);			
+ 	} while (!result && gtk_tree_model_iter_next(model_set, &iter));
+@@ -551,7 +551,7 @@
+ 						prefs_toolbar->item_func_combo));
+ 						
+ 			if (is_duplicate(prefs_toolbar, icon_event)
+-			&& g_utf8_collate(icon_event, set_event) != 0){
++			&& g_strcmp0(icon_event, set_event) != 0){
+ 				alertpanel_error(ERROR_MSG);
+ 				g_free(icon_event);
+ 				g_free(set_event);
+@@ -1179,7 +1179,7 @@
+ 	gtk_button_set_image(GTK_BUTTON(prefs_toolbar->icon_button),
+ 			     gtk_image_new_from_pixbuf(pix));
+ 	
+-	if (g_utf8_collate(toolbar_ret_descr_from_val(A_SEPARATOR), descr) == 0) {
++	if (g_strcmp0(toolbar_ret_descr_from_val(A_SEPARATOR), descr) == 0) {
+ 		gtk_button_set_label(GTK_BUTTON(prefs_toolbar->icon_button),
+ 				    _("None"));
+ 		g_free(prefs_toolbar->item_icon_file);
+@@ -1196,7 +1196,7 @@
+ 	gtk_entry_set_text(GTK_ENTRY(prefs_toolbar->item_text_entry), 
+ 			   icon_text);
+ 
+-	if (g_utf8_collate(toolbar_ret_descr_from_val(A_CLAWS_ACTIONS), descr) == 0) {
++	if (g_strcmp0(toolbar_ret_descr_from_val(A_CLAWS_ACTIONS), descr) == 0) {
+ 		gtk_combo_box_set_active(GTK_COMBO_BOX(
+ 			prefs_toolbar->item_type_combo), ITEM_USER_ACTION);
+ 
+@@ -1205,7 +1205,7 @@
+ 			gchar *item_string;
+ 			get_action_name((gchar *)cur2->data, &item_string);
+ 			
+-			if(g_utf8_collate(item_string, icon_text) == 0) {
++			if(g_strcmp0(item_string, icon_text) == 0) {
+ 				gtk_combo_box_set_active(
+ 					GTK_COMBO_BOX(prefs_toolbar->item_action_combo),
+ 					item_num);
+@@ -1231,7 +1231,7 @@
+ 	for (cur = prefs_toolbar->combo_action_list, item_num = 0; cur != NULL; 
+ 	     cur = cur->next) {
+ 		gchar *item_str = (gchar*)cur->data;
+-		if (g_utf8_collate(item_str, descr) == 0) {
++		if (g_strcmp0(item_str, descr) == 0) {
+ 			gtk_combo_box_set_active(
+ 				GTK_COMBO_BOX(prefs_toolbar->item_func_combo),
+ 				item_num);
+diff -ur claws-mail-3.6.1.orig/src/procmime.c claws-mail-3.6.1/src/procmime.c
+--- claws-mail-3.6.1.orig/src/procmime.c	2008-10-01 09:10:29.000000000 +0200
++++ claws-mail-3.6.1/src/procmime.c	2008-11-14 14:27:12.000000000 +0100
+@@ -1020,14 +1020,6 @@
+ 	return hash_result;
+ }
+ 
+-static gint procmime_str_equal(gconstpointer gptr1, gconstpointer gptr2)
+-{
+-	const char *str1 = gptr1;
+-	const char *str2 = gptr2;
+-
+-	return !g_utf8_collate(str1, str2);
+-}
+-
+ static GHashTable *procmime_get_mime_type_table(void)
+ {
+ 	GHashTable *table = NULL;
+@@ -1040,7 +1032,7 @@
+ 		if (!mime_type_list) return NULL;
+ 	}
+ 
+-	table = g_hash_table_new(procmime_str_hash, procmime_str_equal);
++	table = g_hash_table_new(procmime_str_hash, g_str_equal);
+ 
+ 	for (cur = mime_type_list; cur != NULL; cur = cur->next) {
+ 		gint i;
+diff -ur claws-mail-3.6.1.orig/src/summaryview.c claws-mail-3.6.1/src/summaryview.c
+--- claws-mail-3.6.1.orig/src/summaryview.c	2008-10-09 20:17:53.000000000 +0200
++++ claws-mail-3.6.1/src/summaryview.c	2008-11-14 14:27:12.000000000 +0100
+@@ -4240,7 +4240,7 @@
+ 					g_strdup_printf("%s",
+ 							account->address);
+ 			
+-			if (g_utf8_collate(from_name, msginfo->from) == 0) {
++			if (g_strcmp0(from_name, msginfo->from) == 0) {
+ 				g_free(from_name);
+ 				found = TRUE;
+ 				break;
+diff -ur claws-mail-3.6.1.orig/src/toolbar.c claws-mail-3.6.1/src/toolbar.c
+--- claws-mail-3.6.1.orig/src/toolbar.c	2008-09-13 12:07:43.000000000 +0200
++++ claws-mail-3.6.1/src/toolbar.c	2008-11-14 14:39:07.000000000 +0100
+@@ -236,7 +236,7 @@
+ 	gint i;
+ 
+ 	for (i = 0; i < N_ACTION_VAL; i++) {
+-		if (g_utf8_collate(gettext(toolbar_text[i].descr), descr) == 0)
++		if (g_strcmp0(gettext(toolbar_text[i].descr), descr) == 0)
+ 				return i;
+ 	}
+ 	
+@@ -255,7 +255,7 @@
+ 	gint i;
+ 	
+ 	for (i = 0; i < N_ACTION_VAL; i++) {
+-		if (g_utf8_collate(toolbar_text[i].index_str, text) == 0)
++		if (g_strcmp0(toolbar_text[i].index_str, text) == 0)
+ 				return i;
+ 	}
+ 
+@@ -346,11 +346,11 @@
+ 		name = ((XMLAttr *)attr->data)->name;
+ 		value = ((XMLAttr *)attr->data)->value;
+ 		
+-		if (g_utf8_collate(name, TOOLBAR_ICON_FILE) == 0) 
++		if (g_strcmp0(name, TOOLBAR_ICON_FILE) == 0) 
+ 			item->file = g_strdup (value);
+-		else if (g_utf8_collate(name, TOOLBAR_ICON_TEXT) == 0)
++		else if (g_strcmp0(name, TOOLBAR_ICON_TEXT) == 0)
+ 			item->text = g_strdup (gettext(value));
+-		else if (g_utf8_collate(name, TOOLBAR_ICON_ACTION) == 0)
++		else if (g_strcmp0(name, TOOLBAR_ICON_ACTION) == 0)
+ 			item->index = toolbar_ret_val_from_text(value);
+ 		if (item->index == -1 && !strcmp(value, "A_DELETE")) {
+ 			/* switch button */
+@@ -821,7 +821,7 @@
+ 
+ 				action_p = strstr(action, ": ");
+ 				action_p[0] = 0x00;
+-				if (g_utf8_collate(act->name, action) == 0) {
++				if (g_strcmp0(act->name, action) == 0) {
+ 					found = TRUE;
+ 					g_free(action);
+ 					break;
+diff -ur claws-mail-3.6.1.orig/src/vcard.c claws-mail-3.6.1/src/vcard.c
+--- claws-mail-3.6.1.orig/src/vcard.c	2008-08-06 21:38:43.000000000 +0200
++++ claws-mail-3.6.1/src/vcard.c	2008-11-14 14:27:12.000000000 +0100
+@@ -348,7 +348,7 @@
+ 				str = nodeRemarks->data;
+ 				if( nodeRemarks ) {
+ 					if( str ) {
+-						if( g_utf8_collate( str, "internet" ) != 0 ) {
++						if( g_strcmp0( str, "internet" ) != 0 ) {
+ 							if( *str != '\0' )
+ 								addritem_email_set_remarks( email, str );
+ 						}
+@@ -442,7 +442,7 @@
+ 		/* g_print( "\ttype:  %s\n", tagtype ); */
+ 		/* g_print( "\tvalue: %s\n", tagvalue ); */
+ 
+-		if( g_utf8_collate( tagtype, VCARD_TYPE_QP ) == 0 ) {
++		if( g_strcmp0( tagtype, VCARD_TYPE_QP ) == 0 ) {
+ 			gchar *tmp;
+ 			/* Quoted-Printable: could span multiple lines */
+ 			tagvalue = vcard_read_qp( cardFile, tagvalue );
+@@ -452,26 +452,26 @@
+ 			/* g_print( "QUOTED-PRINTABLE !!! final\n>%s<\n", tagvalue ); */
+ 		}
+ 
+-		if( g_utf8_collate( tagname, VCARD_TAG_START ) == 0 &&
++		if( g_strcmp0( tagname, VCARD_TAG_START ) == 0 &&
+ 			g_ascii_strcasecmp( tagvalue, VCARD_NAME ) == 0 ) {
+ 			/* g_print( "start card\n" ); */
+ 			vcard_free_lists( listName, listAddress, listRemarks, listID );
+ 			listName = listAddress = listRemarks = listID = NULL;
+ 		}
+-		if( g_utf8_collate( tagname, VCARD_TAG_FULLNAME ) == 0 ) {
++		if( g_strcmp0( tagname, VCARD_TAG_FULLNAME ) == 0 ) {
+ 			/* g_print( "- full name: %s\n", tagvalue ); */
+ 			listName = g_slist_append( listName, g_strdup( tagvalue ) );
+ 		}
+-		if( g_utf8_collate( tagname, VCARD_TAG_EMAIL ) == 0 ) {
++		if( g_strcmp0( tagname, VCARD_TAG_EMAIL ) == 0 ) {
+ 			/* g_print( "- address: %s\n", tagvalue ); */
+ 			listAddress = g_slist_append( listAddress, g_strdup( tagvalue ) );
+ 			listRemarks = g_slist_append( listRemarks, g_strdup( tagtype ) );
+ 		}
+-		if( g_utf8_collate( tagname, VCARD_TAG_UID ) == 0 ) {
++		if( g_strcmp0( tagname, VCARD_TAG_UID ) == 0 ) {
+ 			/* g_print( "- id: %s\n", tagvalue ); */
+ 			listID = g_slist_append( listID, g_strdup( tagvalue ) );
+ 		}
+-		if( g_utf8_collate( tagname, VCARD_TAG_END ) == 0 &&
++		if( g_strcmp0( tagname, VCARD_TAG_END ) == 0 &&
+ 			g_ascii_strcasecmp( tagvalue, VCARD_NAME ) == 0 ) {
+ 			/* vCard is complete */
+ 			/* g_print( "end card\n--\n" ); */
+@@ -659,7 +659,7 @@
+ 				tagtemp = NULL;
+ 			}
+ 
+-			if( g_utf8_collate( tagtype, VCARD_TYPE_QP ) == 0 ) {
++			if( g_strcmp0( tagtype, VCARD_TYPE_QP ) == 0 ) {
+ 				gchar *tmp;
+ 				/* Quoted-Printable: could span multiple lines */
+ 				tagvalue = vcard_read_qp( cardFile, tagvalue );
+@@ -667,11 +667,11 @@
+ 				g_free(tagvalue);
+ 				tagvalue=tmp;
+ 			}
+-			if( g_utf8_collate( tagname, VCARD_TAG_START ) == 0 &&
++			if( g_strcmp0( tagname, VCARD_TAG_START ) == 0 &&
+ 				g_ascii_strcasecmp( tagvalue, VCARD_NAME ) == 0 ) {
+ 				haveStart = TRUE;
+ 			}
+-			if( g_utf8_collate( tagname, VCARD_TAG_END ) == 0 &&
++			if( g_strcmp0( tagname, VCARD_TAG_END ) == 0 &&
+ 				g_ascii_strcasecmp( tagvalue, VCARD_NAME ) == 0 ) {
+ 				/* vCard is complete */
+ 				if( haveStart ) cardFile->retVal = MGU_SUCCESS;

new file mode 100644
index 0000000..c5ed7a9
@@ -0,0 +1,19 @@
+Index: claws-mail-2.9.1/claws-mail.desktop
+===================================================================
+--- claws-mail-2.9.1.orig/claws-mail.desktop	2007-04-24 17:40:20.000000000 +0100
++++ claws-mail-2.9.1/claws-mail.desktop	2007-04-25 07:08:36.000000000 +0100
+@@ -1,11 +1,11 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-Name=Claws Mail
++Name=Mail
+ Exec=claws-mail
+ Icon=claws-mail
+-Info="Claws Mail"
++Info=Email Application
+ Categories=GTK;Network;Email;
+-Comment="Gtk+ based Mail Client"
++Comment=Email Application
+ Terminal=false
+ Type=Application
+ StartupNotify=true

new file mode 100644
index 0000000..3c25ca1
@@ -0,0 +1,10 @@
+--- claws-mail-3.6.1/src/gtk/Makefile.am-orig	2008-10-10 00:17:55.000000000 -0700
++++ claws-mail-3.6.1/src/gtk/Makefile.am	2010-03-28 16:08:40.000000000 -0700
+@@ -62,7 +62,6 @@ clawsgtkinclude_HEADERS = \
+ 	menu.h \
+ 	pluginwindow.h \
+ 	prefswindow.h \
+-	gtkvscrollbutton.h \
+ 	progressdialog.h \
+ 	quicksearch.h \
+ 	sslcertwindow.h \

new file mode 100644
index 0000000..c0faedb
@@ -0,0 +1,11 @@
+--- claws-mail-3.6.1.orig/src/common/defs.h	2007-12-18 09:20:54.000000000 +0100
++++ claws-mail-3.6.1/src/common/defs.h	2012-05-06 08:17:56.049692494 +0200
+@@ -24,8 +24,6 @@
+ #  include "config.h"
+ #endif
+ 
+-#include <glibconfig.h>
+-
+ #ifdef G_OS_WIN32
+ #  include <glib/gwin32.h>
+ #endif

62 lines not on this page · raw message

new file mode 100644
index 0000000..118543b
@@ -0,0 +1,19 @@
+SECTION = "x11/network"
+DESCRIPTION = "Mail user agent plugins"
+DEPENDS = "claws-mail gtkhtml2 curl"
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=977f04a8048c04684e521c06e2844a94"
+
+SRC_URI = "http://www.claws-mail.org/downloads/plugins/gtkhtml2_viewer-${PV}.tar.gz"
+SRC_URI[md5sum] = "a6c9dfa6f969ccd844796a5724b52167"
+SRC_URI[sha256sum] = "4d41f6d961efaac0f51705e5052bac732bc0bdafee2ef2082a9cf9d89f183ae5"
+
+inherit autotools pkgconfig gettext
+
+S = "${WORKDIR}/gtkhtml2_viewer-${PV}"
+
+FILES_${PN} = "${libdir}/claws-mail/plugins/*.so"
+FILES_${PN}-dbg += "${libdir}/claws-mail/plugins/.debug"
+FILES_${PN}-dev += "${libdir}/claws-mail/plugins/*.la"
+FILES_${PN}-staticdev = "${libdir}/claws-mail/plugins/*.a"
+

218 lines not on this page · raw message

new file mode 100644
index 0000000..8cb7fd0
@@ -0,0 +1,19 @@
+SECTION = "x11/network"
+DESCRIPTION = "Mail user agent plugins"
+DEPENDS = "claws-mail"
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+
+SRC_URI = "http://www.claws-mail.org/downloads/plugins/mailmbox-${PV}.tar.gz\
+           file://claws-plugin-mailmbox-fixup.patch"
+SRC_URI[md5sum] = "0a5907628c1112cf8e5fe251ed1db551"
+SRC_URI[sha256sum] = "d8d948807b4a09eb6da392161564c4bcee01070c9c86483889f93f1b14fd0870"
+
+inherit autotools pkgconfig
+
+S = "${WORKDIR}/mailmbox-${PV}"
+
+FILES_${PN} = "${libdir}/claws-mail/plugins/*.so"
+FILES_${PN}-dbg += "${libdir}/claws-mail/plugins/.debug"
+FILES_${PN}-dev += "${libdir}/claws-mail/plugins/*.la"
+FILES_${PN}-staticdev = "${libdir}/claws-mail/plugins/*.a"

new file mode 100644
index 0000000..767c672
@@ -0,0 +1,18 @@
+SECTION = "x11/network"
+DESCRIPTION = "Mail user agent plugins"
+DEPENDS = "claws-mail libxml2 curl glib-2.0 gtk+"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=0c2348e0a084e573f0220f5e45d8097e"
+
+SRC_URI = "http://www.claws-mail.org/downloads/plugins/rssyl-${PV}.tar.gz"
+SRC_URI[md5sum] = "7dfd8ae53cf1ed88d5e4150f77b9df63"
+SRC_URI[sha256sum] = "b02eff373fd66daec2ffd75afd3ad97c32c45679883ee65b21aa50fec92fc752"
+
+inherit autotools pkgconfig gettext
+
+S = "${WORKDIR}/rssyl-${PV}"
+
+FILES_${PN} = "${libdir}/claws-mail/plugins/*.so"
+FILES_${PN}-dbg += "${libdir}/claws-mail/plugins/.debug"
+FILES_${PN}-dev += "${libdir}/claws-mail/plugins/*.la"
+FILES_${PN}-staticdev = "${libdir}/claws-mail/plugins/*.a"

new file mode 100644
index 0000000..1520e57
@@ -0,0 +1,11 @@
+--- sylpheed-2.7.1.orig/libsylph/defs.h	2009-06-10 09:55:46.000000000 +0200
++++ sylpheed-2.7.1/libsylph/defs.h	2012-05-06 08:28:27.514746256 +0200
+@@ -24,8 +24,6 @@
+ #  include "config.h"
+ #endif
+ 
+-#include <glibconfig.h>
+-
+ #ifdef G_OS_WIN32
+ #  include <glib/gwin32.h>
+ #endif

new file mode 100644
index 0000000..d0da532
@@ -0,0 +1,37 @@
+SECTION = "x11/network"
+DESCRIPTION = "Mail user agent"
+DEPENDS = "gtk+ gpgme gnutls"
+LICENSE = "GPLv2 & LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4 \
+                    file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
+
+PR = "r1"
+
+SRC_URI = "http://sylpheed.sraoss.jp/sylpheed/v2.7/sylpheed-${PV}.tar.bz2 \
+  file://glib-2.32.patch \
+"
+SRC_URI[md5sum] = "1f470525c1fbe53253813a0978c18228"
+SRC_URI[sha256sum] = "8bb6457db4e2eea1877b487d9ac8513546372db9a6a2e4271d11229f4af84e23"
+
+FILES_${PN} += "${datadir}/pixmaps ${datadir}/applications"
+FILES_${PN}-doc += "${datadir}"
+
+EXTRA_OECONF = "--disable-ssl --enable-gnutls"
+
+CFLAGS += "-D_GNU_SOURCE"
+
+do_configure_prepend() {
+    mkdir -p m4
+    for i in $(find ${S} -name "Makefile.am") ; do
+        sed -i s:'-I$(includedir)'::g $i
+    done
+}
+
+inherit autotools
+
+do_install_append() {
+    install -d ${D}${datadir}/applications
+    install -m 0644 sylpheed.desktop ${D}${datadir}/applications/
+    install -d ${D}${datadir}/pixmaps
+    install -m 0644 sylpheed.png ${D}${datadir}/pixmaps/
+}

new file mode 100644
index 0000000..4ec0668
@@ -0,0 +1,18 @@
+DESCRIPTION = "Epydoc is a tool for generating API documentation for Python modules, based on their docstrings" 
+SECTION = "devel/python" 
+LICENSE = "MIT" 
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=011c0d78eb6054d731c879132d7313f0"
+HOMEPAGE = "http://epydoc.sourceforge.net/" 
+SRCNAME = "epydoc" 
+DEPENDS += "python"
+DEPENDS_virtclass-native += "python-native"
+
+SRC_URI = "http://downloads.sourceforge.net/project/${SRCNAME}/${SRCNAME}/${PV}/${SRCNAME}-${PV}.tar.gz" 
+SRC_URI[md5sum] = "cdd6f6c76dd8bab5e653a343a0544294"
+SRC_URI[sha256sum] = "d4e5c8d90937d01b05170f592c1fa9b29e9ed0498dfe7f0eb2a3af61725b6ad1"
+
+S = "${WORKDIR}/${SRCNAME}-${PV}" 
+
+inherit distutils 
+
+BBCLASSEXTEND = "native"

new file mode 100644
index 0000000..7351759
@@ -0,0 +1,18 @@
+DESCRIPTION = "Google Data APIs Python Client Library"
+SECTION = "devel/python"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://README.txt;md5=473bd4dff0ddca1f958244b2dc7a162c"
+HOMEPAGE = "http://code.google.com/p/gdata-python-client/"
+
+inherit distutils
+
+SRC_URI = "http://gdata-python-client.googlecode.com/files/gdata.py-${PV}.tar.gz"
+SRC_URI[md5sum] = "521f33a377d64f8a6505ba119415b787"
+SRC_URI[sha256sum] = "fc5ddb8f76b17abd728721a0e0177ea35f55a70106f44dc9010b22eceb06abde"
+
+S = "${WORKDIR}/gdata.py-${PV}"
+
+FILES_${PN} += "${datadir}"
+
+RDEPENDS_${PN} = "python-elementtree"
+

new file mode 100644
index 0000000..a703d34
@@ -0,0 +1,14 @@
+--- python-ldap-2.3.9/setup.cfg.orig    2009-08-13 11:07:23.000000000 +0200
++++ python-ldap-2.3.9/setup.cfg 2009-08-13 11:07:37.000000000 +0200
+@@ -1,9 +1,9 @@
+ [_ldap]
+ extra_objects = 
+ extra_compile_args = 
+-libs = ldap_r lber sasl2 ssl crypto
++libs = ldap_r lber ssl crypto
+ library_dirs = /opt/openldap-RE24/lib
+-include_dirs = /opt/openldap-RE24/include /usr/include/sasl
++include_dirs = /opt/openldap-RE24/include
+
+ [egg_info]
+ tag_build =  

new file mode 100644
index 0000000..dfe1522
@@ -0,0 +1,13 @@
+DESCRIPTION = "LDAP client API for Python, C wrapper module around OpenLDAP 2.x with an object-oriented API" 
+SECTION = "devel/python" 
+LICENSE = "Python-style" 
+LIC_FILES_CHKSUM = "file://LICENCE;md5=a41c82edffa04912007cae1d20cac555"
+HOMEPAGE = "http://www.python-ldap.org/" 
+DEPENDS = "python openldap" 
+
+SRC_URI = "http://pypi.python.org/packages/source/p/${PN}/${PN}-${PV}.tar.gz \ 
+           file://setup.cfg.patch"
+SRC_URI[md5sum] = "a9f9f16338288d118a1ae6266c993247"
+SRC_URI[sha256sum] = "62f75b21c5ee744408c9d8b59878328b3bdf47899d30e8abf0c09b3ffb893ed4"
+
+inherit setuptools  

new file mode 100644
index 0000000..7a6437d
@@ -0,0 +1,19 @@
+DESCRIPTION = "This project aims to provide an object-oriented Python WebDAV client-side library\
+               based on Python`s standard httplib and Greg Stein`s davlib.\
+               The client shall fully support RFCs 4918 (basic specification),\
+               3744 (access control), and 3253 (versioning)."
+SECTION = "devel/python"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://src/webdav/WebdavClient.py;endline=15;md5=a1520fad859feb7b0d7f05277bc6ce48"
+HOMEPAGE = "http://sourceforge.net/projects/pythonwebdavlib/"
+SRCNAME = "Python_WebDAV_Library"
+DEPENDS = "python"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/pythonwebdavlib/Python%20WebDAV%20Library%20-%20${PV}/${SRCNAME}-${PV}.zip"
+SRC_URI[md5sum] = "8e49e0ecc5b4327c4f752a544ee10e1a"
+SRC_URI[sha256sum] = "72c029ad1e25de950f59c2f1812d009d2c1691b70e4b5b09f1af9006e8fd5f23"
+
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit distutils
+

new file mode 100644
index 0000000..9c7f3f2
@@ -0,0 +1,18 @@
+DESCRIPTION = "Free GPS navigation for car and outdoor with OpenStreetMap maps"
+HOMEPAGE = "http://www.gps-routes.info/index.php?name=Content&pa=showpage&pid=1"
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a"
+DEPENDS = "ecore evas imlib2 gpsd edje-native mysql5"
+
+SRC_URI = "http://www.gps-routes.info/debian/pool/main/m/mcnavi/mcnavi_${PV}.tar.gz"
+SRC_URI[md5sum] = "acc07debcdb3ef448b95e6a6cfcf53d8"
+SRC_URI[sha256sum] = "d3ce1f5901f13985d877b2b6ad06b64094ba43a4e13cbfe06c7cb2f1abdda309"
+
+S = "${WORKDIR}/${PN}"
+
+do_configure_prepend() {
+  # for some reason our mysql_config returns just sysroot/include_dir while mysql.h is in include_dir/mysql
+  sed -i 's#`mysql_config --include`#`mysql_config --include`/mysql#g' ${S}/configure.ac
+}
+
+inherit autotools

new file mode 100644
index 0000000..5e86113
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=MoNav
+Exec=monav
+Icon=monav
+Terminal=false
+Type=Application
+Categories=Utility;Geography;
+X-MB-SingleInstance=true
+StartupNotify=true
+Comment=Fast navigation system featuring exact routing.

new file mode 100644
index 0000000000000000000000000000000000000000..75b5a79623bf040f1ddfcde3d005dc7fd6de1ed9
GIT binary patch

new file mode 100644
index 0000000..982d682
@@ -0,0 +1,37 @@
+DESCRIPTION = "MoNav is a fast navigation system featuring exact routing with OpenStreetMap data."
+HOMEPAGE = "http://code.google.com/p/monav"
+SECTION = "x11/applications"
+LICENSE = "GPLv3+"
+LIC_FILES_CHKSUM = "file://misc/license_template_christian;md5=d99c9b3bafdde80adee296762376348d"
+
+DEPENDS = "qt-mobility-x11"
+PR = "r1"
+
+SRC_URI = "http://monav.googlecode.com/files/${BPN}-${PV}.tar.gz \
+           file://monav.png \
+           file://monav.desktop"
+
+SRC_URI[md5sum] = "d048ccef8c6a21e8656aa4af3fcb8329"
+SRC_URI[sha256sum] = "5a3bf9e9f7368b81ba8e2f755960082fc42a2e2c78f9de645f99ba293c77ee7f"
+
+inherit qmake2 qt4x11
+
+EXTRA_QMAKEVARS_PRE="CONFIG+="release""
+QMAKE_PROFILES="monavclient.pro"
+
+do_install_append() {
+    install -d ${D}${datadir}/monav
+    install -d ${D}${datadir}/monav/images
+    cp -a ${S}/images/* ${D}${datadir}/monav/images
+
+    install -d ${D}${datadir}/icons
+    install -m 0644 ${WORKDIR}/monav.png ${D}${datadir}/icons
+
+    install -d ${D}${bindir}
+    install -m 0755 ${S}/bin/monav ${D}${bindir}/monav
+
+    install -d ${D}/${datadir}/applications
+    install -m 0644 ${WORKDIR}/monav.desktop ${D}/${datadir}/applications
+}
+
+FILES_${PN} += "${bindir}/monav ${datadir}/icons/monav.png"

59 lines not on this page · raw message

68 lines not on this page · raw message

new file mode 100644
index 0000000..d18a2fd
@@ -0,0 +1,11 @@
+diff -uNr omgps.orig//src/uart.c omgps/src/uart.c
+--- omgps.orig//src/uart.c	2010-08-22 23:34:09.000000000 +0200
++++ omgps/src/uart.c	2010-08-22 23:33:54.000000000 +0200
+@@ -30,6 +30,7 @@
+  * NOTE: these file paths are subject to change according to kernel and distribution.
+  */
+ static const char *sysfs_gps_power[] = {
++	"/sys/bus/platform/devices/gta02-pm-gps.0/power_on",
+ 	"/sys/bus/platform/devices/neo1973-pm-gps.0/power_on",
+ 	"/sys/bus/platform/devices/neo1973-pm-gps.0/pwron"
+ };

new file mode 100644
index 0000000..73d6dba
@@ -0,0 +1,12 @@
+--- a/src/settings.c	2011-12-12 13:21:30.573400795 +0100
++++ b/src/settings.c	2011-12-12 14:11:05.269606119 +0100
+@@ -278,6 +278,9 @@
+ 	}
+ 
+ 	ret = check_settings(errbuf, ERRBUF_LEN);
++	if (ret == FALSE) {
++		snprintf(errbuf, ERRBUF_LEN, "Something wrong while loading settings file");
++	}
+ 
+ 	if (fd > 0)
+ 		close(fd);

new file mode 100644
index 0000000..59fd9b0
@@ -0,0 +1,23 @@
+DESCRIPTION = "GPS application for openmoko freerunner"
+HOMEPAGE = "http://omgps.googlecode.com"
+SECTION = "openmoko/applications"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
+DEPENDS = "gtk+ python-pygobject dbus-glib"
+SRCREV = "109"
+PV = "0.1+svnr${SRCPV}"
+S = "${WORKDIR}/${PN}"
+
+do_configure_prepend() {
+   sed -i "s#PY_VERSION = 2.6#PY_VERSION = ${PYTHON_BASEVERSION}#g" ${S}/Makefile.am
+   sed -i "s#PY_INC_DIR = \$(OPIEDIR)#PY_INC_DIR = ${STAGING_DIR_HOST}#g" ${S}/Makefile.am
+}
+
+SRC_URI = "svn://omgps.googlecode.com/svn/trunk;module=omgps;protocol=http \
+           file://gcc-4.4.patch \
+           file://sysfs.node.2.6.32.patch \
+           file://fix.capability.patch \
+           file://use.unused.variable.patch \
+"
+
+inherit autotools

new file mode 100644
index 0000000000000000000000000000000000000000..d9865b70ce777d6e4b4c437f73095d2329e222ce
GIT binary patch

59 lines not on this page · raw message

new file mode 100644
index 0000000..1e41f5b
@@ -0,0 +1,30 @@
+DESCRIPTION = "Astronomical application which displays the night sky"
+HOMEPAGE    = "http://projects.openmoko.org/projects/orrery/"
+SECTION = "x11/scientific"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://orrery.c;endline=25;md5=d792bdf2b591972da175aecc38d88cfe"
+
+inherit autotools
+
+SRC_URI = "http://projects.openmoko.org/frs/download.php/923/orrery_2.7_clean.tar.gz \
+           file://orrery.png \
+           file://use.GdkPixbuf.patch \
+"
+
+SRC_URI[md5sum]    = "bd62a33e7554ee1030313dfcdefcda8b"
+SRC_URI[sha256sum] = "645166a5e05b2064ab630534a514697fc47b681951e7fe1d635c259cbdf7a5e6"
+
+S = "${WORKDIR}/${PN}"
+
+do_configure_prepend() {
+  # fix DSO issue with binutils-2.22
+  sed -i 's/ -lrt/ -lrt -lm/g' ${S}/Makefile.am
+}
+do_install_append() {
+    install -d ${D}${datadir}/orrery
+    cp -a ${S}/data/* ${D}${datadir}/orrery
+    install -d ${D}${datadir}/icons
+    install -m 0755 ${WORKDIR}/orrery.png ${D}${datadir}/icons
+}
+
+FILES_${PN} += "${datadir}/icons/orrery.png"

new file mode 100644
index 0000000..2d29f17
@@ -0,0 +1,24 @@
+pending upstream, fixed in 23.2
+http://debbugs.gnu.org/cgi-bin/bugreport.cgi?bug=5047
+https://bugzilla.redhat.com/show_bug.cgi?id=540921
+diff -up emacs-23.1/configure.in.cpp emacs-23.1/configure.in
+--- emacs-23.1/configure.in.cpp	2009-11-30 13:24:53.000000000 +0100
++++ emacs-23.1/configure.in	2009-11-30 13:25:45.000000000 +0100
+@@ -2983,7 +2983,7 @@ echo creating lib-src/Makefile
+   sed -e '1,/start of cpp stuff/d'\
+       -e 's,/\*\*/#\(.*\)$,/* \1 */,' \
+       < Makefile.c > junk.c
+-  $CPP $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
++  $CPP -P $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
+       sed -e 's/^ /	/' -e '/^#/d' -e '/^[ 	]*$/d' > junk2.c
+   cat junk1.c junk2.c > Makefile.new
+   rm -f junk.c junk1.c junk2.c
+@@ -2999,7 +2999,7 @@ echo creating src/Makefile
+   sed -e '1,/start of cpp stuff/d'\
+       -e 's,/\*\*/#\(.*\)$,/* \1 */,' \
+       < Makefile.c > junk.c
+-  $CPP $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
++  $CPP -P $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
+       sed -e 's/^ /	/' -e '/^#/d' -e '/^[ 	]*$/d' > junk2.c
+   cat junk1.c junk2.c > Makefile.new
+   rm -f junk.c junk1.c junk2.c

new file mode 100644
index 0000000..4200301
@@ -0,0 +1,16 @@
+Fix linking problem:
+undefined reference to `__aeabi_unwind_cpp_pr0'
+undefined reference to `__aeabi_unwind_cpp_pr1'
+Index: emacs/src/Makefile.in
+===================================================================
+--- emacs.orig/src/Makefile.in	2008-08-16 14:20:18.000000000 +0000
++++ emacs/src/Makefile.in	2008-08-16 14:51:25.000000000 +0000
+@@ -443,7 +443,7 @@
+    ask GCC explicitly where to find libgcc.a.  */
+ 
+ #ifndef LINKER
+-#define LINKER $(CC) -nostdlib
++#define LINKER $(CC) -nostdlib -lgcc_s
+ #endif
+ 
+ #ifndef LIB_GCC

107 lines not on this page · raw message

68 lines not on this page · raw message

new file mode 100644
index 0000000..fe134f8
@@ -0,0 +1,8 @@
+require emacs.inc
+
+SRC_URI = "${GNU_MIRROR}/emacs/emacs-${PV}.tar.gz;name=tarball \
+           file://use-qemu.patch \
+           file://nostdlib-unwind.patch \
+           file://configure.in.lost.backslashes.patch"
+SRC_URI[tarball.md5sum] = "a620d4452769d04ad8864d662f34f8dd"
+SRC_URI[tarball.sha256sum] = "a94cd46301f000d2d1dcd3fd7ef08ad952846d01ca5d4168b4ec3e38e857da47"

new file mode 100644
index 0000000..0e498c7
@@ -0,0 +1,22 @@
+diff -uri fbreader-0.12.1.orig/fbreader/Makefile fbreader-0.12.1/fbreader/Makefile
+--- fbreader-0.12.1.orig/fbreader/Makefile	2009-12-13 09:03:11.000000000 +0100
++++ fbreader-0.12.1/fbreader/Makefile	2009-12-14 17:18:47.548638783 +0100
+@@ -37,7 +37,6 @@
+ 	@install $(TARGET) $(DESTDIR)$(BINDIR)/FBReader
+ 	@install -d $(FBSHAREDIR)
+ 	@install -d $(FBSHAREDIR)/help
+-	@./scripts/install_help.sh $(VARIANT) $(FBSHAREDIR)/help
+ 	@install -d $(FBSHAREDIR)/network
+ 	@install -m 0644 $(wildcard data/network/*.xml) $(FBSHAREDIR)/network
+ 	@install -d $(FBSHAREDIR)/network/certificates
+@@ -58,8 +57,8 @@
+ 	@install -d $(FBSHAREDIR)/resources
+ 	@install -m 0644 $(wildcard data/resources/*.xml) $(FBSHAREDIR)/resources
+ 	@install -d $(DESTDIR)$(APPIMAGEDIR_REAL)
+-	@install -m 0644 $(wildcard data/icons/toolbar/$(VARIANT)/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL)
+-	@install -m 0644 $(wildcard data/icons/filetree/$(VARIANT)/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL)
++	@install -m 0644 $(wildcard data/icons/toolbar/$(TARGET_ARCH)/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL)
++	@install -m 0644 $(wildcard data/icons/filetree/$(TARGET_ARCH)/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL)
+ 	@install -m 0644 $(wildcard data/icons/booktree/new/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL)
+ 	@make -C $(TARGET_ARCH) RESOLUTION=$(RESOLUTION) install
+ 

new file mode 100644
index 0000000..00cba10
@@ -0,0 +1,20 @@
+  Fix compilation with gcc 4.5
+
+  [FBreader Ticket #340] -- http://old.fbreader.org/mantis/view.php?id=340
+
+  Without that patch we have:
+    Compiling Library.o ...Library.cpp:42:1: error: 'Library::Library' names the constructor, not the type
+
+  Upstream-Status: Accepted [Fixed in Version 0.14.0]
+
+--- fbreader-0.12.10-orig/fbreader/src/library/Library.cpp	2010-04-01 15:14:24.000000000 +0200
++++ fbreader-0.12.10/fbreader/src/library/Library.cpp	2010-04-13 13:34:06.000000000 +0200
+@@ -39,7 +39,7 @@
+ shared_ptr<Library> Library::ourInstance;
+ const size_t Library::MaxRecentListSize = 10;
+ 
+-Library::Library &Library::Instance() {
++Library &Library::Instance() {
+ 	if (ourInstance.isNull()) {
+ 		ourInstance = new Library();
+ 	}

new file mode 100644
index 0000000..40fc631
@@ -0,0 +1,40 @@
+DESCRIPTION = "FBreader is an ebook reader"
+HOMEPAGE = "http://www.fbreader.org"
+SECTION = "x11/utils"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://fbreader/LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f"
+DEPENDS = "gtk+ enca expat bzip2 libgpewidget virtual/libiconv liblinebreak libfribidi curl"
+
+SRC_URI = "http://www.fbreader.org/fbreader-sources-${PV}.tgz \
+file://Makefile.patch \
+file://gcc45.patch"
+
+# Set the defaults
+READER_RESOLUTION ?= "1024x600"
+READER_ARCH       ?= "desktop"
+READER_UI         ?= "gtk"
+READER_STATUS     ?= "release"
+
+FILES_${PN} += "${datadir}/FBReader ${datadir}/zlibrary ${libdir}/zlibrary"
+FILES_${PN}-dbg += "${libdir}/zlibrary/ui/.debug/"
+
+CFLAGS_append = " RESOLUTION=${READER_RESOLUTION} INSTALLDIR=${prefix}"
+EXTRA_OEMAKE = "CC='${CXX}' LD='${CXX}' LDFLAGS='${LDFLAGS}' INCPATH='${STAGING_INCDIR}' LIBPATH='${STAGING_LIBDIR}'"
+
+inherit pkgconfig
+
+do_configure() {
+    cd ${WORKDIR}/${PN}-${PV}
+    mv makefiles/target.mk makefiles/target.mk.orig
+
+    echo "TARGET_ARCH = ${READER_ARCH}" > makefiles/target.mk
+    echo "UI_TYPE = ${READER_UI}" >> makefiles/target.mk
+    echo "TARGET_STATUS = ${READER_STATUS}" >> makefiles/target.mk
+}
+
+do_install() {
+    oe_runmake install DESTDIR=${D} RESOLUTION=${READER_RESOLUTION}
+}
+
+SRC_URI[md5sum] = "da9ec4721efdb0ec0aaa182bff16ad82"
+SRC_URI[sha256sum] = "328aec454db80e225aa0b5c31adef74bf62a14357482947e87e9731686b3c624"

41 lines not on this page · raw message

new file mode 100644
index 0000000..f6e1202
@@ -0,0 +1,40 @@
+From da4170b61bb41eff0af170d1d77bfd90f9ebe5dd Mon Sep 17 00:00:00 2001
+From: Denis 'GNUtoo' Carikli <[email protected]>
+Date: Fri, 20 Jan 2012 11:34:42 +0100
+Subject: [PATCH] Fix installation of the icons when RESOLUTION is set
+
+When resolution is set, the following code(in fbreader/Makefile) is executed:
+  VARIANT = $(TARGET_ARCH)
+  ifneq "$(RESOLUTION)" ""
+    VARIANT = $(TARGET_ARCH)_$(RESOLUTION)
+  endif
+
+This fix is based on a patch from the openembedded project,
+  which can be found here:
+    http://cgit.openembedded.org/openembedded/tree/recipes/fbreader/fbreader-0.12.1/Makefile.patch
+
+Signed-off-by: Denis 'GNUtoo' Carikli <[email protected]>
+---
+ Submitted trough github to git://github.com/geometer/FBReader.git as a pull request
+
+ fbreader/Makefile |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/fbreader/Makefile b/fbreader/Makefile
+index bfa9242..03e6cc3 100644
+--- a/fbreader/Makefile
++++ b/fbreader/Makefile
+@@ -60,8 +60,8 @@ do_install:
+ 	@install -d $(FBSHAREDIR)/resources
+ 	@install -m 0644 $(wildcard data/resources/*.xml) $(FBSHAREDIR)/resources
+ 	@install -d $(DESTDIR)$(APPIMAGEDIR_REAL)
+-	@install -m 0644 $(wildcard data/icons/toolbar/$(VARIANT)/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL)
+-	@install -m 0644 $(wildcard data/icons/filetree/$(VARIANT)/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL)
++	@install -m 0644 $(wildcard data/icons/toolbar/$(TARGET_ARCH)/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL)
++	@install -m 0644 $(wildcard data/icons/filetree/$(TARGET_ARCH)/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL)
+ 	@install -m 0644 $(wildcard data/icons/booktree/new/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL)
+ 	@make -C $(TARGET_ARCH) RESOLUTION=$(RESOLUTION) install
+ 
+-- 
+1.7.4.1
+

new file mode 100644
index 0000000..8c01a1f
@@ -0,0 +1,13 @@
+Index: fltk-1.1.9/Makefile
+===================================================================
+--- fltk-1.1.9.orig/Makefile	2008-06-06 16:14:11.936736201 +0200
++++ fltk-1.1.9/Makefile	2008-06-06 16:14:22.526357637 +0200
+@@ -27,7 +27,7 @@
+ 
+ include makeinclude
+ 
+-DIRS	=	$(IMAGEDIRS) src fluid test documentation
++DIRS	=	$(IMAGEDIRS) src fluid documentation
+ 
+ all: makeinclude fltk-config
+ 	for dir in $(DIRS); do\

new file mode 100644
index 0000000..867e9ef
@@ -0,0 +1,13 @@
+src/fl_set_fonts_xft.cxx is using fontconfig symbols
+
+--- a/makeinclude.in	2012-01-26 18:09:58.628799060 +0100
++++ b/makeinclude.in	2012-01-26 18:08:58.115801758 +0100
+@@ -81,7 +81,7 @@
+ AUDIOLIBS	= @AUDIOLIBS@
+ DSOFLAGS	= -L. @DSOFLAGS@
+ LDFLAGS		= $(OPTIM) @LDFLAGS@
+-LDLIBS		= @LIBS@
++LDLIBS		= @LIBS@ -lfontconfig
+ GLDLIBS		= @GLLIB@ @LIBS@
+ LINKFLTK	= @LINKFLTK@
+ LINKFLTKGL	= @LINKFLTKGL@

new file mode 100644
index 0000000..2611b20
@@ -0,0 +1,37 @@
+DESCRIPTION = "FLTK is a cross-platform C++ GUI toolkit"
+HOMEPAGE = "http://www.fltk.org"
+SECTION = "libs"
+LICENSE = "LGPLv2 & FLTK"
+LIC_FILES_CHKSUM = "file://COPYING;md5=1c0b73db66884b6a925e727400315130"
+
+DEPENDS = "alsa-lib zlib jpeg libpng libxext libxft"
+
+SRC_URI = "ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/${PV}/fltk-${PV}-source.tar.bz2 \
+           file://disable_test.patch \
+           file://dso-fix.patch \
+          "
+
+S = "${WORKDIR}/fltk-${PV}"
+
+inherit lib_package autotools binconfig
+
+TARGET_CC_ARCH += "${LDFLAGS} -DXFT_MAJOR=2"
+
+EXTRA_OECONF = "--enable-shared \
+                --enable-threads \
+                --enable-xdbe --enable-xft --enable-gl \
+                --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR}"
+
+do_configure() {
+    oe_runconf
+}
+
+python populate_packages_prepend () {
+    if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
+        bb.data.setVar('PKG_${PN}', 'libfltk${PV}', d)
+}
+
+LEAD_SONAME = "libfltk.so"
+
+SRC_URI[md5sum] = "a1765594bc427ff892e36089fe1fa672"
+SRC_URI[sha256sum] = "37ada22bf2586b8dd30d84209b8b58bdcb864627e5d02ae3f2c323a29261b19a"

new file mode 100644
index 0000000..2dcf9ab
@@ -0,0 +1,32 @@
+#! /bin/sh  
+
+# Grab the common functions
+#. /etc/init.d/functions
+
+# FIXME: 
+# Add a configuration file for GPM here
+
+test -x /usr/sbin/gpm || exit 0
+
+case "$1" in
+  start)
+    if [ ! -p /dev/gpmdata ]; then
+        mkfifo /dev/gpmdata
+    fi
+
+    echo "Starting GPM:" 
+    start-stop-daemon -S -x /usr/sbin/gpm -- -R -m /dev/psaux -t ps2
+    ;;
+  stop)
+    echo "Stopping GPM:" 
+    start-stop-daemon -K -x /usr/sbin/gpm
+    ;;
+  restart|force-reload) 
+    $0 stop
+    $0 start
+    ;;
+  *)
+    usage /etc/init.d/gpm
+esac
+
+exit 0

new file mode 100644
index 0000000..f10217a
@@ -0,0 +1,18 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+Index: gpm-1.99.7/Makefile.in
+===================================================================
+--- gpm-1.99.7.orig/Makefile.in	2008-07-24 03:36:35.000000000 -0700
++++ gpm-1.99.7/Makefile.in	2010-06-22 18:28:45.269507001 -0700
+@@ -19,7 +19,7 @@
+ # user-overridable flags, but it's also all the implicit rule looks at.
+ # missing ?
+ 
+-SUBDIRS = src doc contrib gpm2
++SUBDIRS = src
+ 
+ 
+ ### simple, but effective rules

new file mode 100644
index 0000000..d647eca
@@ -0,0 +1,12 @@
+Index: gpm-1.99.7/src/daemon/processconn.c
+===================================================================
+--- gpm-1.99.7.orig/src/daemon/processconn.c	2010-09-29 17:36:18.571782951 +0400
++++ gpm-1.99.7/src/daemon/processconn.c	2010-09-29 17:42:44.659991758 +0400
+@@ -20,6 +20,7 @@
+  *
+  ********/
+ 
++#define _GNU_SOURCE
+ #include <sys/socket.h>         /* accept */
+ #include <stdlib.h>             /* malloc */
+ #include <unistd.h>             /* close */

43 lines not on this page · raw message

new file mode 100644
index 0000000..e666ce0
@@ -0,0 +1,32 @@
+Taken from upstream subversion repository:
+
+http://code.google.com/p/iksemel/source/detail?r=25
+
+===================================================================
+---
+ configure.ac |   10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+--- iksemel-1.4.orig/configure.ac
++++ iksemel-1.4/configure.ac
+@@ -43,11 +43,19 @@ AM_CONDITIONAL(DO_POSIX, test "x$defio"
+ dnl Checks for library functions
+ AC_SEARCH_LIBS(recv,socket)
+ AC_CHECK_FUNCS(getopt_long)
+ AC_CHECK_FUNCS(getaddrinfo)
+ 
+-AM_PATH_LIBGNUTLS(,AC_DEFINE(HAVE_GNUTLS,,"Use libgnutls"))
++dnl Check GNU TLS
++PKG_CHECK_MODULES(GNUTLS, gnutls >= 2.0.0, have_gnutls=yes, have_gnutls=no)
++if test "x$have_gnutls" = "xyes"; then
++  LIBGNUTLS_CFLAGS="$GNUTLS_CFLAGS"
++  LIBGNUTLS_LIBS="$GNUTLS_LIBS"
++  AC_SUBST(LIBGNUTLS_CFLAGS)
++  AC_SUBST(LIBGNUTLS_LIBS)
++  AC_DEFINE(HAVE_GNUTLS, 1, [whether to use GnuTSL support.])
++fi
+ 
+ dnl Check -Wall flag of GCC
+ if test "x$GCC" = "xyes"; then
+   if test -z "`echo "$CFLAGS" | grep "\-Wall" 2> /dev/null`" ; then
+     CFLAGS="$CFLAGS -Wall"

new file mode 100644
index 0000000..9869149
@@ -0,0 +1,16 @@
+DESCRIPTION = "Fast and portable XML parser and Jabber protocol library"
+AUTHOR = "Gurer Ozen <meduketto at gmail.com>"
+HOMEPAGE = "http://iksemel.googlecode.com"
+SECTION = "libs"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499"
+DEPENDS = "gnutls"
+
+PR = "r1"
+
+SRC_URI = "http://iksemel.googlecode.com/files/${P}.tar.gz;name=archive \
+           file://r25.diff"
+SRC_URI[archive.md5sum] = "532e77181694f87ad5eb59435d11c1ca"
+SRC_URI[archive.sha256sum] = "458c1b8fb3349076a6cecf26c29db1d561315d84e16bfcfba419f327f502e244"
+
+inherit autotools pkgconfig

new file mode 100644
index 0000000..6c9190f
@@ -0,0 +1,13 @@
+SECTION = "console/utils"
+DESCRIPTION = "Console text editor with good functionality, good choice for vi-haters."
+HOMEPAGE = "http://joe-editor.sourceforge.net/"
+LICENSE = "GPLv1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=da10ed7cf8038981c580e11c1d3e8fb6"
+RDEPENDS_${PN} = "ncurses-terminfo"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/joe-editor/joe-${PV}.tar.gz"
+
+inherit autotools
+
+SRC_URI[md5sum] = "2a6ef018870fca9b7df85401994fb0e0"
+SRC_URI[sha256sum] = "252390e4bc687957f09f334095904c8cc53b39c7b663ed47861ae1d11aef5946"

new file mode 100644
index 0000000..41c3826
@@ -0,0 +1,11 @@
+--- links-2.1pre20/configure.in.orig	2005-12-21 15:23:49.000000000 +0000
++++ links-2.1pre20/configure.in	2005-12-21 15:23:59.000000000 +0000
+@@ -18,7 +18,7 @@
+ dnl Checks for programs.
+ AC_PROG_CC
+ 
+-#AC_PROG_CXX
++AC_PROG_CXX
+ #AC_PROG_AWK
+ #AM_PROG_LEX
+ #AC_PROG_YACC

106 lines not on this page · raw message

new file mode 100644
index 0000000..0d3b407
@@ -0,0 +1,20 @@
+--- links-2.1pre17/cookies.c.pix	2005-05-15 23:05:10.000000000 +0800
++++ links-2.1pre17/cookies.c	2005-05-15 23:17:21.000000000 +0800
+@@ -41,7 +41,7 @@
+ 
+ void free_cookie(struct cookie *c)
+ {
+-	mem_free(c->name);
++	if (c->value) mem_free(c->name);
+ 	if (c->value) mem_free(c->value);
+ 	if (c->server) mem_free(c->server);
+ 	if (c->path) mem_free(c->path);
+@@ -355,7 +355,7 @@
+ 
+ inv:
+ 		free_cookie(cookie);
+-		free(cookie);
++		mem_free(cookie);
+ 	}
+ 	fclose(fp);
+ }

new file mode 100644
index 0000000..a05bce1
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Links
+Comment=Links is a browser very similar to lynx
+Comment[es]=El links es un browser para modo texto, similar a lynx
+Comment[pl]=Links jest przeglądarką podobną do lynksa
+Comment[pt]=O links é um browser para modo texto, similar ao lynx
+Comment[pt_BR]=O links é um browser para modo texto, similar ao lynx
+Exec=links -g
+Terminal=true
+Icon=links2
+Type=Application
+Categories=Application;ConsoleOnly;Network;WebBrowser;
+# vi: encoding=utf-8

new file mode 100644
index 0000000..b71da9f
@@ -0,0 +1,26 @@
+require links.inc
+
+DEPENDS += "virtual/libx11"
+RCONFLICTS_${PN} = "links"
+
+SRC_URI += " file://links2.desktop \
+             http://www.xora.org.uk/oe/links2.png;name=icon"
+
+EXTRA_OECONF = "--enable-javascript --with-libfl --enable-graphics \
+                --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \
+                --without-libtiff --without-svgalib --without-fb \
+                --without-directfb --without-pmshell --without-atheos \
+                --with-x --without-gpm --without-sdl"
+
+do_install_append() {
+    install -d ${D}/${datadir}/applications
+    install -m 0644 ${WORKDIR}/links2.desktop ${D}/${datadir}/applications
+    install -d ${D}/${datadir}/pixmaps
+    install -m 0644 ${WORKDIR}/links2.png ${D}/${datadir}/pixmaps
+}
+
+
+SRC_URI[md5sum] = "f0f107cc824b71e43f0c6ab620209daf"
+SRC_URI[sha256sum] = "f32314d851e86ec463967ddce78d051e3953b529878cbaeecf882c625ad29c75"
+SRC_URI[icon.md5sum] = "477e8787927c634614bac01b44355a33"
+SRC_URI[icon.sha256sum] = "eddcd8b8c8698aa621d1a453943892d77b72ed492e0d14e0dbac5c6a57e52f47"

new file mode 100644
index 0000000..9001d2a
@@ -0,0 +1,19 @@
+DESCRIPTION = "Links is graphics and text mode WWW \
+browser, similar to Lynx."
+HOMEPAGE = "http://links.twibright.com/"
+SECTION = "console/network"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b0c80473f97008e42e29a9f80fcc55ff"
+DEPENDS = "jpeg libpng flex openssl zlib"
+
+LPV = "${@bb.data.getVar("PV",d,1).split("+")[1]}"
+
+SRC_URI = "http://links.twibright.com/download/links-${LPV}.tar.bz2 \
+           file://ac-prog-cxx.patch \
+           file://cookies-save-0.96.patch \
+           file://links-2.1pre17-fix-segfault-on-loading-cookies.patch"
+
+inherit autotools
+
+S = "${WORKDIR}/links-${LPV}"
+

new file mode 100644
index 0000000..2496173
@@ -0,0 +1,13 @@
+require links.inc
+
+DEPENDS += "gpm"
+RCONFLICTS_${PN} = "links-x11"
+
+EXTRA_OECONF = "--enable-javascript --with-libfl --enable-graphics \
+                --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \
+                --without-libtiff --without-svgalib --with-fb \
+                --without-directfb --without-pmshell --without-atheos \
+                --without-x --without-sdl"
+
+SRC_URI[md5sum] = "f0f107cc824b71e43f0c6ab620209daf"
+SRC_URI[sha256sum] = "f32314d851e86ec463967ddce78d051e3953b529878cbaeecf882c625ad29c75"

new file mode 100644
index 0000000..2f6cdb0
@@ -0,0 +1,23 @@
+--- ode-0.9.orig/Makefile.am	2007-02-21 15:54:54.000000000 +0100
++++ ode-0.9/Makefile.am	2010-08-21 16:15:55.000000000 +0200
+@@ -25,13 +25,13 @@
+ 
+ if USE_SONAME
+ install-exec-hook:
+-	ln -s $(libdir)/@ODE_SONAME@.@ODE_REVISION@.@ODE_AGE@ \
+-	$(libdir)/libode.so
+-	ln -s $(libdir)/@ODE_SONAME@.@ODE_REVISION@.@ODE_AGE@ \
+-	$(libdir)/@ODE_SONAME@
+-	ln -s $(libdir)/@ODE_SONAME@.@ODE_REVISION@.@ODE_AGE@ \
+-	$(libdir)/@ODE_SONAME@.@ODE_REVISION@
+-	/sbin/ldconfig
++	ln -s @ODE_SONAME@.@ODE_REVISION@.@ODE_AGE@ \
++	$(DESTDIR)/$(libdir)/libode.so
++	ln -s @ODE_SONAME@.@ODE_REVISION@.@ODE_AGE@ \
++	$(DESTDIR)/$(libdir)/@ODE_SONAME@
++	ln -s @ODE_SONAME@.@ODE_REVISION@.@ODE_AGE@ \
++	$(DESTDIR)/$(libdir)/@ODE_SONAME@.@ODE_REVISION@
++	echo /sbin/ldconfig
+ else
+ install-exec-hook:
+ endif

new file mode 100644
index 0000000..d076abb
@@ -0,0 +1,24 @@
+DESCRIPTION = "ODE is an Open Source Physics Engine."
+SECTION = "libs"
+HOMEPAGE = "http://www.ode.org"
+LICENSE = "LGPLv2.1 & BSD"
+LIC_FILES_CHKSUM = "file://LICENSE-BSD.TXT;md5=c74e6304a772117e059458fb9763a928 \
+                    file://LICENSE.TXT;md5=771782cb6245c7fbbe74bc0ec059beff"
+
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/opende/ode-src-${PV}.zip \
+           file://install.patch"
+
+SRC_URI[md5sum] = "4c03759b76a0649a6d5108c8e172e1e4"
+SRC_URI[sha256sum] = "460d0851b743b1f144ef2a8259004d6774504c95d08e9357a96a296111496feb"
+
+inherit autotools binconfig
+
+EXTRA_OECONF = "--disable-demos --enable-soname"
+
+do_configure_append() {
+    echo "#define dInfinity DBL_MAX" >>include/ode/config.h
+}
+
+FILES_${PN} = "${libdir}/lib*${SOLIBS}"
+

new file mode 100644
index 0000000..40881cd
@@ -0,0 +1,29 @@
+#! /bin/sh
+#
+# This is an init script for openembedded
+# Copy it to /etc/init.d/openldap and type
+# > update-rc.d openldap defaults 60
+#
+
+
+slapd=/usr/libexec/slapd
+test -x "$slapd" || exit 0
+
+
+case "$1" in
+  start)
+    echo -n "Starting OpenLDAP: "
+    start-stop-daemon --start --quiet --exec $slapd
+    echo "."
+    ;;
+  stop)
+    echo -n "Stopping OpenLDAP: "
+    start-stop-daemon --stop --quiet --pidfile /var/run/slapd.pid
+    echo "."
+    ;;
+  *)
+    echo "Usage: /etc/init.d/openldap {start|stop}"
+    exit 1
+esac
+
+exit 0
\ No newline at end of file

new file mode 100644
index 0000000..9d7640c
@@ -0,0 +1,14 @@
+# This patch ensures that the install operations which strip
+# programs and libraries (LTINSTALL) work in a cross build
+# environment.
+--- openldap-2.2.24/.pc/install-strip.patch/build/top.mk	2005-01-20 09:00:55.000000000 -0800
++++ openldap-2.2.24/build/top.mk	2005-04-16 13:48:20.536710376 -0700
+@@ -116,7 +116,7 @@
+ LTLINK_MOD = $(LIBTOOL) $(LTONLY_MOD) --mode=link \
+ 	$(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_MOD)
+ 
+-LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) 
++LTINSTALL = STRIPPROG="@STRIP@" $(LIBTOOL) --mode=install $(top_srcdir)/contrib/ldapc++/install-sh -c
+ LTFINISH = $(LIBTOOL) --mode=finish
+ 
+ # Misc UNIX commands used in build environment

new file mode 100644
index 0000000..b669b72
@@ -0,0 +1,20 @@
+--- openldap-2.3.11/build/openldap.m4.orig	2005-11-11 00:11:18.604322590 -0800
++++ openldap-2.3.11/build/openldap.m4	2005-11-11 00:26:21.621145856 -0800
+@@ -788,7 +788,7 @@ AC_DEFUN([OL_PTHREAD_TEST_FUNCTION],[[
+ ]])
+ 
+ AC_DEFUN([OL_PTHREAD_TEST_PROGRAM],
+-AC_LANG_SOURCE([OL_PTHREAD_TEST_INCLUDES
++[AC_LANG_SOURCE([[OL_PTHREAD_TEST_INCLUDES
+ 
+ int main(argc, argv)
+ 	int argc;
+@@ -796,7 +796,7 @@ int main(argc, argv)
+ {
+ OL_PTHREAD_TEST_FUNCTION
+ }
+-]))
++]])])
+ dnl --------------------------------------------------------------------
+ AC_DEFUN([OL_PTHREAD_TRY], [# Pthread try link: $1 ($2)
+ if test "$ol_link_threads" = no ; then

270 lines not on this page · raw message

new file mode 100644
index 0000000..0575058
@@ -0,0 +1,29 @@
+DESCRIPTION = "Libsyncml is an implementation of the SyncML protocol."
+HOMEPAGE = "https://libsyncml.opensync.org/"
+SECTION = "libs"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fad9b3332be894bab9bc501572864b29"
+
+DEPENDS = "libxml2 glib-2.0"
+RRECOMMENDS_${PN} = "wbxml2 openobex libsoup-2.4"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/libsyncml/libsyncml-${PV}.tar.gz"
+SRC_URI[md5sum] = "84879ed7cb94618530fbcb801a1a4f95"
+SRC_URI[sha256sum] = "05d6513637adb1300a3a58b6e29d53ab6373c8f370807d0d925bae72b2920e53"
+
+inherit cmake pkgconfig
+
+EXTRA_OECMAKE += " . -B${WORKDIR}/build "
+
+PACKAGES += "${PN}-tools"
+
+FILES_${PN}-tools = "${bindir}"
+FILES_${PN} = "${libdir}/*.so.*"
+
+do_build_prepend() {
+    cd ${WORKDIR}/build
+}
+
+do_install_prepend() {
+    cd ${WORKDIR}/build
+}

new file mode 100644
index 0000000..c87e477
@@ -0,0 +1,29 @@
+DESCRIPTION = "WBXML parsing and encoding library."
+HOMEPAGE = "http://libwbxml.opensync.org/"
+SECTION = "libs"
+LICENSE = "LGPLv2.1+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c1128ee5341ccd5927d8bafe4b6266e1"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/libwbxml/libwbxml-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "f5031e9f730ffd9dc6a2d1ded585e1d1"
+SRC_URI[sha256sum] = "a057daa098f12838eb4e635bb28413027f1b73819872c3fbf64e3207790a3f7d"
+
+S = "${WORKDIR}/libwbxml-${PV}"
+
+inherit cmake pkgconfig
+
+EXTRA_OECMAKE += " . -B${WORKDIR}/build "
+
+PACKAGES += "${PN}-tools"
+
+FILES_${PN}-tools = "${bindir}"
+FILES_${PN} = "${libdir}/*.so.*"
+
+do_build_prepend() {
+    cd ${WORKDIR}/build
+}
+
+do_install_prepend() {
+    cd ${WORKDIR}/build
+}

44 lines not on this page · raw message

new file mode 100644
index 0000000..3346e18
@@ -0,0 +1,30 @@
+DESCRIPTION = "Full-featured IRC chat client with scripting support"
+LICENSE = "GPLv2+"
+HOMEPAGE = "http://www.xchat.org"
+SECTION = "x11/network"
+DEPENDS = "libgcrypt zlib gtk+"
+DEPENDS += "gdk-pixbuf-native"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b"
+
+PR = "r1"
+
+SRC_URI = "http://xchat.org/files/source/2.8/xchat-${PV}.tar.bz2 \
+  file://glib-2.32.patch \
+"
+
+inherit autotools gettext
+
+EXTRA_OECONF = "\
+  --disable-perl \
+  --disable-python \
+  --disable-tcl \
+"
+do_configure_prepend(){
+    rm -f ${S}/po/Makefile.in.in
+}
+
+FILES_${PN} += "${datadir}/dbus-1"
+FILES_${PN}-dbg += "${libdir}/xchat/plugins/.debug"
+
+SRC_URI[md5sum] = "6775c44f38e84d06c06c336b32c4a452"
+SRC_URI[sha256sum] = "0d6d69437b5e1e45f3e66270fe369344943de8a1190e498fafa5296315a27db0"

new file mode 100644
index 0000000..ea13e11
@@ -0,0 +1,25 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- liblockfile-1.05/./configure.in~configure
++++ liblockfile-1.05/./configure.in
+@@ -1,4 +1,5 @@
+-AC_INIT(lockfile.c)
++AC_INIT
++AC_CONFIG_SRCDIR([lockfile.c])
+ AC_CONFIG_HEADER(autoconf.h)
+ AC_REVISION($Revision: 1.0 $)dnl
+ 
+@@ -111,7 +112,8 @@
+ AC_SUBST(INSTALL_TARGETS)
+ AC_SUBST(nfslockdir)
+ 
+-AC_OUTPUT(\
++AC_CONFIG_FILES([\
+ 	./Makefile \
+ 	./maillock.h \
+-)
++])
++AC_OUTPUT

70 lines not on this page · raw message

48 lines not on this page · raw message

new file mode 100644
index 0000000..eb1d147
@@ -0,0 +1,21 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- liblockfile-1.05/Makefile.in~ldflags
++++ liblockfile-1.05/Makefile.in
+@@ -34,11 +34,11 @@
+ 
+ liblockfile.so: liblockfile.a
+ 		$(CC) -fPIC -shared -Wl,-soname,liblockfile.so.1 \
+-			-o liblockfile.so lockfile.o -lc
++			-o liblockfile.so lockfile.o $(LDFLAGS) -lc
+ 
+ nfslock.so.$(VER):	nfslock.o
+ 		$(CC) -fPIC -shared -Wl,-soname,nfslock.so.0 \
+-			-o nfslock.so.$(NVER) nfslock.o
++			-o nfslock.so.$(NVER) nfslock.o $(LDFLAGS)
+ 
+ dotlockfile:	dotlockfile.o xlockfile.o
+ 		$(CC) $(LDFLAGS) -o dotlockfile dotlockfile.o xlockfile.o

new file mode 100644
index 0000000..971eff1
@@ -0,0 +1,21 @@
+DESCRIPTION = "File locking library."
+SECTION = "libs"
+LICENSE = "LGPLv2+ & GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=35127b30003a121544b5d13a2ac868b6"
+
+SRC_URI = "http://snapshot.debian.org/archive/debian/20050312T000000Z/pool/main/libl/liblockfile/liblockfile_${PV}.tar.gz \
+	   file://install.patch \
+	   file://configure.patch \
+	   file://ldflags.patch \
+	   file://glibc-2.4.patch"
+
+inherit autotools
+
+EXTRA_OECONF = "--enable-shared --enable-static"
+
+do_install () {
+	oe_runmake 'ROOT=${D}' INSTGRP='' install
+}
+
+SRC_URI[md5sum] = "2de88389da013488bfd31356523070c0"
+SRC_URI[sha256sum] = "14f9690328318d11f9ba13a9356a2c008bdd169b7a817f38cb7f9eb32cf7240e"

new file mode 100644
index 0000000..0e9bf9b
@@ -0,0 +1,14 @@
+DESCRIPTION = "shared library for GIF images"
+SECTION = "libs"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ae11c61b04b2917be39b11f78d71519a"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/giflib/libungif-${PV}.tar.bz2"
+SRC_URI[md5sum] = "8c198831cc0495596c78134b8849e9ad"
+SRC_URI[sha256sum] = "59e835a57e6df03e4d2253b2357253f3d13da9473ff465563a3b9833a744fc36"
+
+inherit autotools lib_package
+
+PACKAGES =+ "${PN}-utils"
+
+FILES_${PN}-utils = "${bindir}/*"

new file mode 100644
index 0000000..0396c0c
@@ -0,0 +1,39 @@
+Upstream-Status: Backport
+
+from bzr changeset 99307
+
+=== modified file 'ChangeLog'
+--- ChangeLog	2010-01-12 05:11:05 +0000
++++ ChangeLog	2010-01-12 16:25:08 +0000
+@@ -1,3 +1,7 @@
++2010-01-12  Chong Yidong  <[email protected]>
++
++	* configure.in: Explicitly check for and link to -lXrender.
++
+ 2010-01-12  Glenn Morris  <[email protected]>
+ 
+ 	* INSTALL.BZR, README: Use bug-gnu-emacs rather than emacs-pretest-bug
+
+=== modified file 'configure.in'
+--- configure.in	2010-01-04 05:35:18 +0000
++++ configure.in	2010-01-12 16:25:08 +0000
+@@ -1984,12 +1984,17 @@
+     if test "x${with_xft}" != "xno"; then
+ 
+       PKG_CHECK_MODULES(XFT, xft >= 0.13.0, , HAVE_XFT=no)
+-      if test "$HAVE_XFT" != no; then
++      ## Because xftfont.c uses XRenderQueryExtension, we also
++      ## need to link to -lXrender.
++      HAVE_XRENDER=no
++      AC_CHECK_LIB(Xrender, XRenderQueryExtension, HAVE_XRENDER=yes)
++      if test "$HAVE_XFT" != no && test "$HAVE_XRENDER" != no; then
+ 	OLD_CPPFLAGS="$CPPFLAGS"
+ 	OLD_CFLAGS="$CFLAGS"
+ 	OLD_LIBS="$LIBS"
+ 	CPPFLAGS="$CPPFLAGS $XFT_CFLAGS"
+ 	CFLAGS="$CFLAGS $XFT_CFLAGS"
++	XFT_LIBS="-lXrender $XFT_LIBS"
+ 	LIBS="$XFT_LIBS $LIBS"
+ 	AC_CHECK_HEADER(X11/Xft/Xft.h,
+ 	  AC_CHECK_LIB(Xft, XftFontOpen, HAVE_XFT=yes, , $XFT_LIBS))
+

index fe134f8..fa7c872 100644
@@ -3,6 +3,8 @@ require emacs.inc
 SRC_URI = "${GNU_MIRROR}/emacs/emacs-${PV}.tar.gz;name=tarball \
            file://use-qemu.patch \
            file://nostdlib-unwind.patch \
-           file://configure.in.lost.backslashes.patch"
+           file://configure.in.lost.backslashes.patch \
+           file://fix.dso.build.patch \
+"
 SRC_URI[tarball.md5sum] = "a620d4452769d04ad8864d662f34f8dd"
 SRC_URI[tarball.sha256sum] = "a94cd46301f000d2d1dcd3fd7ef08ad952846d01ca5d4168b4ec3e38e857da47"

new file mode 100644
index 0000000..4200301
@@ -0,0 +1,16 @@
+Fix linking problem:
+undefined reference to `__aeabi_unwind_cpp_pr0'
+undefined reference to `__aeabi_unwind_cpp_pr1'
+Index: emacs/src/Makefile.in
+===================================================================
+--- emacs.orig/src/Makefile.in	2008-08-16 14:20:18.000000000 +0000
++++ emacs/src/Makefile.in	2008-08-16 14:51:25.000000000 +0000
+@@ -443,7 +443,7 @@
+    ask GCC explicitly where to find libgcc.a.  */
+ 
+ #ifndef LINKER
+-#define LINKER $(CC) -nostdlib
++#define LINKER $(CC) -nostdlib -lgcc_s
+ #endif
+ 
+ #ifndef LIB_GCC

104 lines not on this page · raw message

index 5883719..f6cd461 100644
@@ -10,7 +10,7 @@ DEPENDS +=" liblockfile"
 
 X11DEPENDS = "gtk+ libungif dbus"
 
-EXTRA_OECONF =  "--without-sound "
+EXTRA_OECONF =  "--without-sound --with-crt-dir=${STAGING_LIBDIR} "
 
 PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
 PACKAGECONFIG[x11] = "--with-x-toolkit=gtk,--without-x,${X11DEPENDS}"

@@ -22,7 +22,7 @@ PACKAGES =+ "${PN}-el"
 FILES_${PN}-el = "${datadir}/emacs/*/*/*.el.gz \
                   ${datadir}/emacs/*/*/*/*.el.gz"
 
-FILES_${PN} += "${datadir}/emacs"
+FILES_${PN} += "${datadir}/emacs ${datadir}/icons"
 
 FILES_${PN}-dbg += "${libexecdir}/emacs/*/*/.debug ${datadir}/emacs/*/*/.debug"
 

new file mode 100644
index 0000000..3c97e9e
@@ -0,0 +1,10 @@
+require emacs.inc
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "${GNU_MIRROR}/emacs/emacs-${PV}.tar.gz;name=tarball \
+           file://use-qemu.patch \
+           file://nostdlib-unwind.patch \
+"
+SRC_URI[tarball.md5sum] = "34405165fcd978fbc8b304cbd99ccf4f"
+SRC_URI[tarball.sha256sum] = "b9a2b8434052771f797d2032772eba862ff9aa143029efc72295170607289c18"

new file mode 100644
index 0000000..b56e690
@@ -0,0 +1,121 @@
+From dad8537110c27b45795f8879a3e0a54aa77546b9 Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <[email protected]>
+Date: Tue, 11 Jan 2011 18:10:39 +0200
+Subject: [PATCH] ARM: qemu related workarounds in cpu features detection code
+
+Signed-off-by: Martin Jansa <[email protected]>
+---
+ pixman/pixman-cpu.c |   67 +++++++++++++++++++++++++++++++++++++++++---------
+ 1 files changed, 55 insertions(+), 12 deletions(-)
+
+diff --git a/pixman/pixman-cpu.c b/pixman/pixman-cpu.c
+index aa9036f..a8f2494 100644
+--- a/pixman/pixman-cpu.c
++++ b/pixman/pixman-cpu.c
+@@ -333,15 +333,30 @@ pixman_arm_read_auxv_or_cpu_features ()
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/mman.h>
++#include <sys/utsname.h>
+ #include <fcntl.h>
+ #include <string.h>
+ #include <elf.h>
+ 
++/*
++ * The whole CPU capabilities detection is a bit ugly: when running in
++ * userspace qemu, we see /proc/self/auxv from the host system. To make
++ * everything even worse, the size of each value is 64-bit when running
++ * on a 64-bit host system. So the data is totally bogus because we expect
++ * 32-bit values. As AT_PLATFORM value is used as a pointer, it may cause
++ * segfault (null pointer dereference on x86-64 host). So in order to be
++ * on a safe side, we require that AT_PLATFORM value is found only once,
++ * and it has non-zero value (this is still not totally reliable for a big
++ * endian 64-bit host system running qemu and may theoretically fail).
++ */
+ static void
+ pixman_arm_read_auxv_or_cpu_features ()
+ {
+     int fd;
+     Elf32_auxv_t aux;
++    uint32_t hwcap = 0;
++    const char *plat = NULL;
++    int plat_cnt = 0;
+ 
+     fd = open ("/proc/self/auxv", O_RDONLY);
+     if (fd >= 0)
+@@ -350,32 +365,60 @@ pixman_arm_read_auxv_or_cpu_features ()
+ 	{
+ 	    if (aux.a_type == AT_HWCAP)
+ 	    {
+-		uint32_t hwcap = aux.a_un.a_val;
+-		/* hardcode these values to avoid depending on specific
+-		 * versions of the hwcap header, e.g. HWCAP_NEON
+-		 */
+-		arm_has_vfp = (hwcap & 64) != 0;
+-		arm_has_iwmmxt = (hwcap & 512) != 0;
+-		/* this flag is only present on kernel 2.6.29 */
+-		arm_has_neon = (hwcap & 4096) != 0;
++		hwcap = aux.a_un.a_val;
+ 	    }
+ 	    else if (aux.a_type == AT_PLATFORM)
+ 	    {
+-		const char *plat = (const char*) aux.a_un.a_val;
+-		if (strncmp (plat, "v7l", 3) == 0)
++		plat = (const char*) aux.a_un.a_val;
++		plat_cnt++;
++	    }
++	}
++	close (fd);
++
++	if (plat == NULL || plat_cnt != 1 || *plat != 'v')
++	{
++	    /*
++	     * Something seems to be really wrong, most likely we are
++	     * running under qemu. Let's use machine type from "uname" for
++	     * CPU capabilities detection:
++	     * http://www.mail-archive.com/qemu-devel at nongnu.org/msg22212.html
++	     */
++	    struct utsname u;
++	    hwcap = 0; /* clear hwcap, because it is bogus */
++	    if (uname (&u) == 0)
++	    {
++		if (strcmp (u.machine, "armv7l") == 0)
+ 		{
+ 		    arm_has_v7 = TRUE;
+ 		    arm_has_v6 = TRUE;
++		    hwcap |= 64; /* qemu is supposed to emulate vfp */
++		    hwcap |= 4096; /* qemu is supposed to emulate neon */
+ 		}
+-		else if (strncmp (plat, "v6l", 3) == 0)
++		else if (strcmp (u.machine, "armv6l") == 0)
+ 		{
+ 		    arm_has_v6 = TRUE;
++		    hwcap |= 64; /* qemu is supposed to emulate vfp */
+ 		}
+ 	    }
+ 	}
+-	close (fd);
++	else if (strncmp (plat, "v7l", 3) == 0)
++	{
++	    arm_has_v7 = TRUE;
++	    arm_has_v6 = TRUE;
++	}
++	else if (strncmp (plat, "v6l", 3) == 0)
++	{
++	    arm_has_v6 = TRUE;
++	}
+     }
+ 
++    /* hardcode these values to avoid depending on specific
++     * versions of the hwcap header, e.g. HWCAP_NEON
++     */
++    arm_has_vfp = (hwcap & 64) != 0;
++    arm_has_iwmmxt = (hwcap & 512) != 0;
++    arm_has_neon = (hwcap & 4096) != 0;
++
+     arm_tests_initialized = TRUE;
+ }
+ 
+-- 
+1.7.8.6
+

index 579d508..b5be2b5 100644
@@ -1,8 +1,10 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
 
-PRINC := "${@int(PRINC) + 9}"
+PRINC := "${@int(PRINC) + 10}"
 
-SRC_URI += " file://0008-Generic-C-implementation-of-pixman_blt-with-overlapp.patch"
+SRC_URI += " file://0008-Generic-C-implementation-of-pixman_blt-with-overlapp.patch \
+  file://0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch \
+"
 
 NEON = " --disable-arm-neon "
 NEON_armv7a = " "

deleted file mode 100644
index 2d29f17..0000000
@@ -1,24 +0,0 @@
-pending upstream, fixed in 23.2
-http://debbugs.gnu.org/cgi-bin/bugreport.cgi?bug=5047
-https://bugzilla.redhat.com/show_bug.cgi?id=540921
-diff -up emacs-23.1/configure.in.cpp emacs-23.1/configure.in
---- emacs-23.1/configure.in.cpp	2009-11-30 13:24:53.000000000 +0100
-+++ emacs-23.1/configure.in	2009-11-30 13:25:45.000000000 +0100
-@@ -2983,7 +2983,7 @@ echo creating lib-src/Makefile
-   sed -e '1,/start of cpp stuff/d'\
-       -e 's,/\*\*/#\(.*\)$,/* \1 */,' \
-       < Makefile.c > junk.c
--  $CPP $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
-+  $CPP -P $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
-       sed -e 's/^ /	/' -e '/^#/d' -e '/^[ 	]*$/d' > junk2.c
-   cat junk1.c junk2.c > Makefile.new
-   rm -f junk.c junk1.c junk2.c
-@@ -2999,7 +2999,7 @@ echo creating src/Makefile
-   sed -e '1,/start of cpp stuff/d'\
-       -e 's,/\*\*/#\(.*\)$,/* \1 */,' \
-       < Makefile.c > junk.c
--  $CPP $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
-+  $CPP -P $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
-       sed -e 's/^ /	/' -e '/^#/d' -e '/^[ 	]*$/d' > junk2.c
-   cat junk1.c junk2.c > Makefile.new
-   rm -f junk.c junk1.c junk2.c

deleted file mode 100644
index 0396c0c..0000000
@@ -1,39 +0,0 @@
-Upstream-Status: Backport
-
-from bzr changeset 99307
-
-=== modified file 'ChangeLog'
---- ChangeLog	2010-01-12 05:11:05 +0000
-+++ ChangeLog	2010-01-12 16:25:08 +0000
-@@ -1,3 +1,7 @@
-+2010-01-12  Chong Yidong  <[email protected]>
-+
-+	* configure.in: Explicitly check for and link to -lXrender.
-+
- 2010-01-12  Glenn Morris  <[email protected]>
- 
- 	* INSTALL.BZR, README: Use bug-gnu-emacs rather than emacs-pretest-bug
-
-=== modified file 'configure.in'
---- configure.in	2010-01-04 05:35:18 +0000
-+++ configure.in	2010-01-12 16:25:08 +0000
-@@ -1984,12 +1984,17 @@
-     if test "x${with_xft}" != "xno"; then
- 
-       PKG_CHECK_MODULES(XFT, xft >= 0.13.0, , HAVE_XFT=no)
--      if test "$HAVE_XFT" != no; then
-+      ## Because xftfont.c uses XRenderQueryExtension, we also
-+      ## need to link to -lXrender.
-+      HAVE_XRENDER=no
-+      AC_CHECK_LIB(Xrender, XRenderQueryExtension, HAVE_XRENDER=yes)
-+      if test "$HAVE_XFT" != no && test "$HAVE_XRENDER" != no; then
- 	OLD_CPPFLAGS="$CPPFLAGS"
- 	OLD_CFLAGS="$CFLAGS"
- 	OLD_LIBS="$LIBS"
- 	CPPFLAGS="$CPPFLAGS $XFT_CFLAGS"
- 	CFLAGS="$CFLAGS $XFT_CFLAGS"
-+	XFT_LIBS="-lXrender $XFT_LIBS"
- 	LIBS="$XFT_LIBS $LIBS"
- 	AC_CHECK_HEADER(X11/Xft/Xft.h,
- 	  AC_CHECK_LIB(Xft, XftFontOpen, HAVE_XFT=yes, , $XFT_LIBS))
-

deleted file mode 100644
index 4200301..0000000
@@ -1,16 +0,0 @@
-Fix linking problem:
-undefined reference to `__aeabi_unwind_cpp_pr0'
-undefined reference to `__aeabi_unwind_cpp_pr1'
-Index: emacs/src/Makefile.in
-===================================================================
---- emacs.orig/src/Makefile.in	2008-08-16 14:20:18.000000000 +0000
-+++ emacs/src/Makefile.in	2008-08-16 14:51:25.000000000 +0000
-@@ -443,7 +443,7 @@
-    ask GCC explicitly where to find libgcc.a.  */
- 
- #ifndef LINKER
--#define LINKER $(CC) -nostdlib
-+#define LINKER $(CC) -nostdlib -lgcc_s
- #endif
- 
- #ifndef LIB_GCC

107 lines not on this page · raw message

deleted file mode 100644
index fa7c872..0000000
@@ -1,10 +0,0 @@
-require emacs.inc
-
-SRC_URI = "${GNU_MIRROR}/emacs/emacs-${PV}.tar.gz;name=tarball \
-           file://use-qemu.patch \
-           file://nostdlib-unwind.patch \
-           file://configure.in.lost.backslashes.patch \
-           file://fix.dso.build.patch \
-"
-SRC_URI[tarball.md5sum] = "a620d4452769d04ad8864d662f34f8dd"
-SRC_URI[tarball.sha256sum] = "a94cd46301f000d2d1dcd3fd7ef08ad952846d01ca5d4168b4ec3e38e857da47"

index 3c97e9e..625a4b9 100644
@@ -1,7 +1,5 @@
 require emacs.inc
 
-DEFAULT_PREFERENCE = "-1"
-
 SRC_URI = "${GNU_MIRROR}/emacs/emacs-${PV}.tar.gz;name=tarball \
            file://use-qemu.patch \
            file://nostdlib-unwind.patch \