File libgweather-2.26.1-windows.patch of Package mingw32-libgweather

Overview Repositories Revisions Requests Users Attributes Meta

File libgweather-2.26.1-windows.patch of Package mingw32-libgweather (Revision 471f8501ba279d6c4b75c217bb7c2888)

Currently displaying revision 471f8501ba279d6c4b75c217bb7c2888 , Show latest

--- configure.in	(revision 734)
+++ configure.in	(working copy)
@@ -153,6 +153,15 @@
 
 
 dnl ***************************************************************************
+dnl ***  REGEX                                                              ***
+dnl ***************************************************************************
+AC_CHECK_FUNCS(regexec,,[AC_CHECK_LIB(regex,regexec,
+               [REGEX_LIBS=-lregex],
+               [AC_MSG_ERROR([No regex library found])])])
+AC_SUBST(REGEX_LIBS)
+
+
+dnl ***************************************************************************
 dnl *** Check for presence of tm.tm_gmtoff on the system                    ***
 dnl ***************************************************************************
 AC_CHECK_MEMBER([struct tm.tm_gmtoff],[struct_tm_tm_gmtoff=true],[struct_tm_tm_gmtoff=false],[#include <time.h>])
--- libgweather/weather.c	(revision 734)
+++ libgweather/weather.c	(working copy)
@@ -41,10 +41,6 @@
 #include "weather.h"
 #include "weather-priv.h"
 
-#ifdef G_OS_WIN32
-#include "gweather-win32.h"
-#endif
-
 static void _weather_internal_check (void);
 
 
--- libgweather/weather-sun.c	(revision 734)
+++ libgweather/weather-sun.c	(working copy)
@@ -37,7 +37,7 @@
 #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
 #include "weather-priv.h"
 
-#ifdef G_OS_WIN32
+#ifdef _WIN32
 #include "gweather-win32.h"
 #endif
 
--- libgweather/gweather-win32.c	(revision 734)
+++ libgweather/gweather-win32.c	(working copy)
@@ -22,7 +22,7 @@
 #include <config.h>
 #endif
 
-#ifdef G_OS_WIN32
+#ifdef _WIN32
 
 #include <windows.h>
 
@@ -73,4 +73,20 @@
     return retval;
 }
 
+char *
+_gweather_win32_get_xml_location_dir (void)
+{
+    static char *retval = NULL;
+    char *root;
+
+    if (retval)
+	return retval;
+
+    root = g_win32_get_package_installation_directory_of_module (dll);
+    retval = g_build_filename (root, "share/libgweather", NULL);
+    g_free (root);
+
+    return retval;
+}
+
 #endif
--- libgweather/gweather-win32.h	(revision 734)
+++ libgweather/gweather-win32.h	(working copy)
@@ -21,10 +21,8 @@
 #ifndef __GWEATHER_WIN32_H__
 #define __GWEATHER_WIN32_H__
 
-G_BEGIN_DECLS
+#ifdef _WIN32
 
-#ifdef G_OS_WIN32
-
 #define localtime_r(t,tmp) (localtime (t) ? ((*tmp) = *localtime (t), tmp) : NULL)
 
 #undef GNOMELOCALEDIR
@@ -33,11 +31,13 @@
 #undef ZONEINFO_DIR
 #define ZONEINFO_DIR _gweather_win32_get_zoneinfo_dir ()
 
+#undef GWEATHER_XML_LOCATION_DIR
+#define GWEATHER_XML_LOCATION_DIR _gweather_win32_get_xml_location_dir ()
+
 char *_gweather_win32_get_locale_dir (void);
 char *_gweather_win32_get_zoneinfo_dir (void);
+char *_gweather_win32_get_xml_location_dir (void);
 
 #endif
 
-G_END_DECLS
-
 #endif /* __GWEATHER_WIN32_H__ */
--- libgweather/parser.c	(revision 734)
+++ libgweather/parser.c	(working copy)
@@ -23,6 +23,8 @@
 #endif
 
 #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
+#include "weather-priv.h"
+
 #include "parser.h"
 
 #include <string.h>
@@ -199,11 +201,11 @@
      * the english names (depending on the configure flags).
      */
     if (!filename)
-	filename = g_strdup (GWEATHER_XML_LOCATION_DIR "/Locations.xml");
+	filename = g_build_filename (GWEATHER_XML_LOCATION_DIR, "Locations.xml", NULL);
 
     if (!g_file_test (filename, G_FILE_TEST_IS_REGULAR) && zlib_support) {
         g_free (filename);
-	filename = g_strdup (GWEATHER_XML_LOCATION_DIR "/Locations.xml.gz");
+	filename = g_build_filename (GWEATHER_XML_LOCATION_DIR, "Locations.xml.gz", NULL);
     }
 
     /* Open the xml file containing the different locations */
--- libgweather/weather-priv.h	(revision 734)
+++ libgweather/weather-priv.h	(working copy)
@@ -33,6 +33,10 @@
 #include "weather.h"
 #include "gweather-location.h"
 
+#ifdef _WIN32
+#include "gweather-win32.h"
+#endif
+
 const char *gweather_gettext (const char *str) G_GNUC_FORMAT (1);
 const char *gweather_dpgettext (const char *context, const char *str) G_GNUC_FORMAT (2);
 #define _(str) (gweather_gettext (str))
--- libgweather/gweather-timezone.c	(revision 734)
+++ libgweather/gweather-timezone.c	(working copy)
@@ -28,10 +28,6 @@
 #include "gweather-timezone.h"
 #include "parser.h"
 
-#ifdef G_OS_WIN32
-#include "gweather-win32.h"
-#endif
-
 /**
  * GWeatherTimezone:
  *
--- libgweather/weather-metar.c	(revision 734)
+++ libgweather/weather-metar.c	(working copy)
@@ -29,10 +29,6 @@
 #include "weather.h"
 #include "weather-priv.h"
 
-#ifdef G_OS_WIN32
-#include "gweather-win32.h"
-#endif
-
 enum {
     TIME_RE,
     WIND_RE,
--- libgweather/Makefile.am	(revision 734)
+++ libgweather/Makefile.am	(working copy)
@@ -53,7 +53,8 @@
 	$(GTK_LIBS)	\
 	$(LIBXML_LIBS)	\
 	$(LIBSOUP_LIBS)	\
-	$(GCONF_LIBS)
+	$(GCONF_LIBS) \
+	$(REGEX_LIBS)
 
 libgweather_la_LDFLAGS = \
 	-version-info $(LT_VERSION) -no-undefined
@@ -86,6 +87,7 @@
 
 test_metar_LDADD = \
 	$(LIBSOUP_LIBS)	\
+	$(REXEX_LIBS) \
 	libgweather.la
 
 test_locations_SOURCES = test_locations.c
@@ -122,8 +124,13 @@
 	done
 endif
 
-EXTRA_DIST = gweather.pc.in gweather-uninstalled.pc.in $(schema_in_files)
+EXTRA_DIST = \
+	gweather-enum-types.c.tmpl \
+	gweather-enum-types.h.tmpl \
+	gweather.pc.in gweather-uninstalled.pc.in \
+	$(schema_in_files)
 
+
 EXTRA_PROGRAMS = test_metar
 
 CLEANFILES = $(schema_DATA) $(EXTRA_PROGRAMS) $(MKENUMS_GENERATED)
--- /dev/null	2009-04-14 11:55:47.000000000 +0200
+++ libgweather/gweather-enum-types.c.tmpl	2009-03-19 13:35:02.000000000 +0100
@@ -0,0 +1,35 @@
+/*** BEGIN file-header ***/
+#define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
+#include "gweather-enum-types.h"
+#include "gweather-location.h"
+/*** END file-header ***/
+
+/*** BEGIN file-production ***/
+/* enumerations from "@filename@" */
+/*** END file-production ***/
+
+/*** BEGIN value-header ***/
+GType
+@enum_name@_get_type (void)
+{
+	static GType etype = 0;
+	if (G_UNLIKELY (etype == 0)) {
+		static const G@Type@Value values[] = {
+/*** END value-header ***/
+
+/*** BEGIN value-production ***/
+			{ @VALUENAME@, "@VALUENAME@", "@valuenick@" },
+/*** END value-production ***/
+
+/*** BEGIN value-tail ***/
+			{ 0, NULL, NULL }
+		};
+		etype = g_@type@_register_static (g_intern_static_string ("@EnumName@"), values);
+	}
+	return etype;
+}
+
+/*** END value-tail ***/
+
+/*** BEGIN file-tail ***/
+/*** END file-tail ***/
--- /dev/null	2009-04-14 11:55:47.000000000 +0200
+++ libgweather/gweather-enum-types.h.tmpl	2009-03-19 13:35:02.000000000 +0100
@@ -0,0 +1,24 @@
+/*** BEGIN file-header ***/
+#ifndef __GWEATHER_ENUM_TYPES_H__
+#define __GWEATHER_ENUM_TYPES_H__
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+/*** END file-header ***/
+
+/*** BEGIN file-production ***/
+
+/* enumerations from "@filename@" */
+/*** END file-production ***/
+
+/*** BEGIN value-header ***/
+GType @enum_name@_get_type (void) G_GNUC_CONST;
+#define GWEATHER_TYPE_@ENUMSHORT@ (@enum_name@_get_type ())
+/*** END value-header ***/
+
+/*** BEGIN file-tail ***/
+G_END_DECLS
+
+#endif /* __GWEATHER_ENUM_TYPES_H__ */
+/*** END file-tail ***/

Places

File libgweather-2.26.1-windows.patch of Package mingw32-libgweather (Revision 471f8501ba279d6c4b75c217bb7c2888)

Places