[csw-devel] SF.net SVN: gar:[21007] csw/mgar/pkg/dconf/trunk

slowfranklin at users.sourceforge.net slowfranklin at users.sourceforge.net
Mon May 6 11:45:17 CEST 2013


Revision: 21007
          http://gar.svn.sourceforge.net/gar/?rev=21007&view=rev
Author:   slowfranklin
Date:     2013-05-06 09:45:16 +0000 (Mon, 06 May 2013)
Log Message:
-----------
dconf/trunk: Fix one dep, add comments, add portability patch

Modified Paths:
--------------
    csw/mgar/pkg/dconf/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/dconf/trunk/files/0000-Add-mkdtemp-replacement-function.patch

Modified: csw/mgar/pkg/dconf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dconf/trunk/Makefile	2013-05-06 06:49:35 UTC (rev 21006)
+++ csw/mgar/pkg/dconf/trunk/Makefile	2013-05-06 09:45:16 UTC (rev 21007)
@@ -13,10 +13,13 @@
 endef
 
 MASTER_SITES = $(GNOME_MIRROR)
-DISTFILES  = $(NAME)-$(VERSION).tar.bz2
+DISTFILES  = $(DISTNAME).tar.bz2
 GARCOMPILER = GNU
 
+# for xproto
 EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
+
+# the package Makefile fails to add these to the header search path
 EXTRA_INC = $(prefix)/include/gtk-2.0
 EXTRA_INC += $(prefix)/include/cairo
 EXTRA_INC += $(prefix)/include/pango-1.0
@@ -24,7 +27,7 @@
 EXTRA_INC += $(prefix)/include/gdk-pixbuf-2.0/
 EXTRA_INC += $(prefix)/include/atk-1.0/
 
-BUILD_DEP_PKGS += CSWlibdbusdev
+BUILD_DEP_PKGS += CSWlibdbus-dev
 BUILD_DEP_PKGS += CSWpkgconfig
 BUILD_DEP_PKGS += CSWglib2devel
 BUILD_DEP_PKGS += CSWgtk2devel
@@ -48,11 +51,14 @@
 PKGFILES_CSWlibdconf-dev += $(call baseisadirs,$(datadir),vala/vapi/dconf\.vapi)
 RUNTIME_DEP_PKGS_CSWlibdconf-dev += CSWlibdconf0
 
+PATCHFILES += 0000-Add-mkdtemp-replacement-function.patch
 PATCHFILES += 0001-Use-statvfs-for-checking-filesystem-type.patch
 PATCHFILES += 0002-Remove-linker-flags-remove-c89-request.patch
 PATCHFILES += 0003-Add-gio-includes.patch
 
 CONFIGURE_ARGS = $(DIRPATHS)
+# package must be compiled in C99 mode; add __EXTENSIONS__ so the headers expose
+# all interfaces that go beyong C99, cf man standards.5
 CONFIGURE_ARGS += CFLAGS="-std=c99 -D__EXTENSIONS__"
 
 include gar/category.mk

Added: csw/mgar/pkg/dconf/trunk/files/0000-Add-mkdtemp-replacement-function.patch
===================================================================
--- csw/mgar/pkg/dconf/trunk/files/0000-Add-mkdtemp-replacement-function.patch	                        (rev 0)
+++ csw/mgar/pkg/dconf/trunk/files/0000-Add-mkdtemp-replacement-function.patch	2013-05-06 09:45:16 UTC (rev 21007)
@@ -0,0 +1,34 @@
+From 41f345e8d78e79f7aaabfbd4569f890cc2e2f188 Mon Sep 17 00:00:00 2001
+From: Ralph Boehme <sloowfranklin at gmail.com>
+Date: Mon, 6 May 2013 11:20:05 +0200
+Subject: [PATCH] Add mkdtemp replacement function
+
+---
+ service/dconf-state.c | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/service/dconf-state.c b/service/dconf-state.c
+index 0ed156e..59f7106 100644
+--- a/service/dconf-state.c
++++ b/service/dconf-state.c
+@@ -7,6 +7,17 @@
+ #include <stdio.h>
+ #include <errno.h>
+ 
++#include <sys/types.h>
++#include <sys/stat.h>
++
++static char *
++mkdtemp(char *template)
++{
++  if (!mktemp(template) || mkdir(template, 0700))
++    return NULL;
++  return template;
++}
++
+ static void
+ dconf_state_init_session (DConfState *state)
+ {
+-- 
+1.8.1.4
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list