File gmime-cflags.patch of Package gmime

Overview Repositories Revisions Requests Users Attributes Meta

File gmime-cflags.patch of Package gmime (Revision 47ee804c8f8c8c443d53ba9168aef3be)

Currently displaying revision 47ee804c8f8c8c443d53ba9168aef3be , Show latest

--- Makefile.am
+++ Makefile.am
@@ -49,7 +49,6 @@
 ## Use sed and then mv to avoid problems if the user interrupts.
 	sed -e 's?\@GMIME_LIBDIR\@?$(GMIME_LIBDIR)?g' \
 	    -e 's?\@GMIME_INCLUDEDIR\@?$(GMIME_INCLUDEDIR)?g' \
-	    -e 's?\@GMIME_CFLAGS\@?$(GMIME_CFLAGS)?g' \
 	    -e 's?\@GMIME_LIBS\@?$(GMIME_LIBS)?g' \
 	    -e 's?\@VERSION\@?$(VERSION)?g' \
 	      < $(srcdir)/gmimeConf.sh.in > gmimeConf.tmp \
--- configure.in
+++ configure.in
@@ -298,49 +298,12 @@
 dnl *************************************
 dnl *** Checks for large file support ***
 dnl *************************************
-AC_ARG_ENABLE(largefile,
-	      AC_HELP_STRING([--enable-largefile],
-	      [enable support for large files [[default=no]]]),,
-	      enable_largefile=no)
-if test "x$enable_largefile" != "xno"; then
-    AC_SYS_LARGEFILE
-    AC_CACHE_CHECK([for _LARGEFILE64_SOURCE value needed for large files], largefile64_source,
-    [
-	AC_TRY_COMPILE([
-		#define _LARGEFILE64_SOURCE
-		#include <sys/types.h>
-		#include <sys/stat.h>
-		#include <fcntl.h>
-	],[
-		int fd = open ("__o_largefile", O_CREAT | O_RDWR | O_LARGEFILE, 0644);
-	],[
-		largefile64_source="yes"
-	],[
-		largefile64_source="no"
-	])
-    ])
-
-    if test "x$largefile64_source" = "xyes"; then
-	GMIME_CFLAGS="-D_LARGEFILE64_SOURCE"
-	if test -n "$ac_cv_sys_file_offset_bits"; then
-		GMIME_CFLAGS="$GMIME_CFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits"
-	fi
-    else
-	GMIME_CFLAGS=""
-	AC_DEFINE(O_LARGEFILE, 0, [Define to 0 if your system does not have the O_LARGEFILE flag])
-    fi
-else
-    GMIME_CFLAGS=""
-fi
-AM_CONDITIONAL(ENABLE_LARGEFILE, test "x$largefile64_source" = "xyes")
+AC_SYS_LARGEFILE
 
 dnl Check type sizes
-CFLAGS_save="$CFLAGS"
-CFLAGS="$CFLAGS $GMIME_CFLAGS"
 AC_CHECK_SIZEOF(ssize_t)
 AC_CHECK_SIZEOF(size_t)
 AC_CHECK_SIZEOF(off_t)
-CFLAGS="$CFLAGS_save"
 
 dnl convenience printf formatting macros for ssize_t/size_t/off_t
 if test $ac_cv_sizeof_size_t -eq 8; then
@@ -467,7 +430,6 @@
 AC_SUBST(GMIME_LIBS)
 AC_SUBST(GMIME_LIBDIR)
 AC_SUBST(GMIME_INCLUDEDIR)
-AC_SUBST(GMIME_CFLAGS)
 
 
 AC_OUTPUT(
--- examples/Makefile.am
+++ examples/Makefile.am
@@ -4,7 +4,7 @@
 
 extra_DIST = README
 
-INCLUDES = -I$(top_srcdir) $(GMIME_CFLAGS) $(GLIB_CFLAGS)
+INCLUDES = -I$(top_srcdir) $(GLIB_CFLAGS)
 
 noinst_PROGRAMS = basic-example imap-example
 
--- gmime-2.0.pc.in
+++ gmime-2.0.pc.in
@@ -9,4 +9,4 @@
 Description: MIME parser and utility library
 Requires: glib-2.0,gobject-2.0
 Libs: -L${libdir} @GMIME_LIBS@
-Cflags: -I${includedir}/gmime-2.0 @GMIME_CFLAGS@
+Cflags: -I${includedir}/gmime-2.0
--- gmime-config.in
+++ gmime-config.in
@@ -55,7 +55,7 @@
 	;;
 
     --cflags)
-       	echo @GMIME_INCLUDEDIR@ @GMIME_CFLAGS@ @glib_cflags@
+       	echo @GMIME_INCLUDEDIR@ @glib_cflags@
        	;;
 
     --libs)
--- gmime/Makefile.am
+++ gmime/Makefile.am
@@ -10,7 +10,6 @@
 	$(VERSION_FLAGS) 		\
 	-DG_LOG_DOMAIN=\"gmime\"	\
 	-DG_DISABLE_DEPRECATED		\
-	$(GMIME_CFLAGS)			\
 	$(GLIB_CFLAGS)
 
 VERSION_FLAGS = -DGMIME_VERSION=\"$(GMIME_VERSION)\" 		\
--- gmimeConf.sh.in
+++ gmimeConf.sh.in
@@ -3,6 +3,5 @@
 #
 GMIME_LIBDIR="@GMIME_LIBDIR@"
 GMIME_LIBS="@GMIME_LIBS@"
-GMIME_CFLAGS="@GMIME_CFLAGS@"
 GMIME_INCLUDEDIR="@GMIME_INCLUDEDIR@"
 MODULE_VERSION="gmime-@VERSION@"
--- mono/GMime.metadata.in
+++ mono/GMime.metadata.in
@@ -49,10 +49,10 @@
        "gint64" and marshaled as a C# "long".  See Makefile.am for the actual
        replacement. -->
 
-  <attr path="/api/namespace/*/field[@type='off_t']" name="type">@off_t_type@</attr>
-  <attr path="/api/namespace/*/*/return-type[@type='off_t']" name="type">@off_t_type@</attr>
-  <attr path="/api/namespace/*/*/parameter[@type='off_t']" name="type">@off_t_type@</attr>
-  <attr path="/api/namespace/*/*/*/parameter[@type='off_t']" name="type">@off_t_type@</attr>
+  <attr path="/api/namespace/*/field[@type='off_t']" name="type">off_t</attr>
+  <attr path="/api/namespace/*/*/return-type[@type='off_t']" name="type">off_t</attr>
+  <attr path="/api/namespace/*/*/parameter[@type='off_t']" name="type">off_t</attr>
+  <attr path="/api/namespace/*/*/*/parameter[@type='off_t']" name="type">off_t</attr>
 
   
--- mono/Makefile.am
+++ mono/Makefile.am
@@ -1,7 +1,6 @@
 API=gmime-api.xml
 RAW_API = gmime-api.raw
 METADATA = GMime.metadata
-METADATA_IN = $(METADATA).in
 ASSEMBLY_NAME = gmime-sharp
 references = $(GTK_SHARP_LIBS)
 SOURCES_XML = sources.xml
@@ -12,7 +11,7 @@
 gapidir = $(datadir)/gapi-2.0
 noinst_DATA = $(ASSEMBLY) $(ASSEMBLY).config
 gapi_DATA = $(API)
-CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) $(METADATA)
+CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API)
 DISTCLEANFILES = $(ASSEMBLY).config AssemblyInfo.cs
 
 pkgconfigdir = $(libdir)/pkgconfig
@@ -48,21 +47,12 @@
 	$(ASSEMBLY_NAME).pub	\
 	AssemblyInfo.cs.in	\
 	$(RAW_API)		\
-	$(METADATA_IN)		\
+	$(METADATA)		\
 	$(customs)		\
 	$(sources)		\
 	$(SOURCES_XML)		\
 	gmime-sharp.pc.in
 
-if ENABLE_LARGEFILE
-off_t_type=gint64
-else
-off_t_type=long
-endif
-
-$(METADATA): $(srcdir)/$(METADATA_IN)
-	sed -e 's|\@off_t_type\@|$(off_t_type)|g' < $(srcdir)/$(METADATA_IN) > $@
-
 $(API): $(srcdir)/$(RAW_API) $(METADATA)
 	cp $(srcdir)/$(RAW_API) $(API)
 	chmod u+w $(API)
--- src/Makefile.am
+++ src/Makefile.am
@@ -2,7 +2,7 @@
 
 SUBDIRS = .
 
-INCLUDES = -I$(top_srcdir) $(GMIME_CFLAGS) $(GLIB_CFLAGS)
+INCLUDES = -I$(top_srcdir) $(GLIB_CFLAGS)
 
 bin_PROGRAMS = uuencode uudecode
 
--- tests/Makefile.am
+++ tests/Makefile.am
@@ -8,7 +8,6 @@
 	$(VERSION_FLAGS) 		\
 	-DG_LOG_DOMAIN=\"gmime-tests\"	\
 	-DG_DISABLE_DEPRECATED		\
-	$(GMIME_CFLAGS)			\
 	$(GLIB_CFLAGS)
 
 VERSION_FLAGS = -DGMIME_VERSION=\"$(GMIME_VERSION)\" 		\
--- util/Makefile.am
+++ util/Makefile.am
@@ -8,7 +8,6 @@
 	$(VERSION_FLAGS) 		\
 	-DG_LOG_DOMAIN=\"util\"		\
 	-DG_DISABLE_DEPRECATED		\
-	$(GMIME_CFLAGS)			\
 	$(GLIB_CFLAGS)
 
 libutil_la_SOURCES =			\

Places

File gmime-cflags.patch of Package gmime (Revision 47ee804c8f8c8c443d53ba9168aef3be)

Places