[Pkg-gambas-commits] [SCM] gambas3 branch, master, updated. debian/2.99.3-1-33-g0ae51d5

Tue Sep 3 12:36:51 UTC 2013

The following commit has been merged in the master branch:
commit 0ae51d5ef05e8a6195979230f1822153a41efe06
Author: José L. Redrejo Rodríguez <jredrejo at debian.org>
Date:   Tue Sep 3 14:36:44 2013 +0200

    new patch for kfreebsd_support, Closes #710320

diff --git a/debian/changelog b/debian/changelog
index 7eb9092..6cb0ccf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ gambas3 (3.4.2-1) UNRELEASED; urgency=low
     - Added new dependencies for the new Gambas3 components.
     - Fixed some build dependencies to match current Debian sid repo.
   * debian/patches/fix_typos (Closes: #690509, #690510)
+  * debian/patches/kfreebsd_support (Closes: #710320) . Thanks to 
+    Steven Chamberlain 
 
  -- José L. Redrejo <jose at mint>  Tue, 03 Sep 2013 12:52:14 +0200
 
diff --git a/debian/control b/debian/control
index f1fd183..fdbdf30 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Homepage: http://gambas.sourceforge.net
 Maintainer: Gambas Debian Maintainers <pkg-gambas-devel at lists.alioth.debian.org> 
 Uploaders: Ian Haywood <ian at haywood.id.au>, David Paleino <dapal at debian.org>, José L. Redrejo Rodríguez <jredrejo at debian.org>
-Build-Depends: debhelper (>> 7), dh-autoreconf, libpq-dev, libv4l-dev [linux-any], libcam-dev [kfreebsd-any], libmysqlclient-dev, libbz2-dev, libglew-dev, libqt4-dev, libqt4-opengl-dev, libcurl4-openssl-dev, libsdl-mixer1.2-dev, libsqlite0-dev, libxml2-dev, libxslt1-dev, kdelibs5-dev, libssl-dev, zlib1g-dev, unixodbc-dev, libsqlite3-dev, libgtk2.0-dev, libxt-dev, pkg-config, mesa-common-dev, libsdl-sound1.2-dev, libsdl-image1.2-dev, libsdl-gfx1.2-dev, libsdl-ttf2.0-dev, libpcre3-dev, libsdl1.2-dev, libjpeg-dev, libpng12-dev, libpoppler-private-dev, libimlib2-dev, librsvg2-dev, bzip2, gettext, libxtst-dev, libffi-dev, libdbus-1-dev, libgnome-keyring-dev, libgtkglext1-dev, linux-libc-dev [linux-any], libc0.1 [kfreebsd-any], libqtwebkit-dev, libgsl0-dev, libncurses5-dev, llvm-dev, libgmime-2.6-dev
+Build-Depends: debhelper (>> 7), dh-autoreconf, libpq-dev, libv4l-dev [linux-any], libv4l-dev [kfreebsd-any], libcam-dev [kfreebsd-any], libmysqlclient-dev, libbz2-dev, libglew-dev, libqt4-dev, libqt4-opengl-dev, libcurl4-openssl-dev, libsdl-mixer1.2-dev, libsqlite0-dev, libxml2-dev, libxslt1-dev, kdelibs5-dev, libssl-dev, zlib1g-dev, unixodbc-dev, libsqlite3-dev, libgtk2.0-dev, libxt-dev, pkg-config, mesa-common-dev, libsdl-sound1.2-dev, libsdl-image1.2-dev, libsdl-gfx1.2-dev, libsdl-ttf2.0-dev, libpcre3-dev, libsdl1.2-dev, libjpeg-dev, libpng12-dev, libpoppler-private-dev, libimlib2-dev, librsvg2-dev, bzip2, gettext, libxtst-dev, libffi-dev, libdbus-1-dev, libgnome-keyring-dev, libgtkglext1-dev, linux-libc-dev [linux-any], libc0.1 [kfreebsd-any], libqtwebkit-dev, libgsl0-dev, libncurses5-dev, llvm-dev, libgmime-2.6-dev
 Standards-Version: 3.9.3
 
 Package: gambas3
diff --git a/debian/patches/fix_typos b/debian/patches/fix_typos
new file mode 100644
index 0000000..31156d8
--- /dev/null
+++ b/debian/patches/fix_typos
@@ -0,0 +1,22 @@
+Index: gambas3/app/src/gambas3/tips/tips.en
+===================================================================
+--- gambas3.orig/app/src/gambas3/tips/tips.en	2013-09-03 12:19:54.819261341 +0200
++++ gambas3/app/src/gambas3/tips/tips.en	2013-09-03 14:16:51.385559935 +0200
+@@ -60,7 +60,7 @@
+ 
+ <h3>Path concatenation</h3>
+ 
+-<p>Do you know that you can catenate directory names and
++<p>Do you know that you can concatenate directory names and
+ file names with the <b><tt>&/</tt></b> operator ? This operator
+ deals with the trailing slashes so that the resulting path is
+ perfect.</p>
+@@ -74,7 +74,7 @@
+ → /home/gambas/tmp/foo.bar
+ </pre>
+ 
+-<p>Isn't it marvellous ?</p>
++<p>Isn't it marvelous ?</p>
+ 
+ 
+ [EXEC]
diff --git a/debian/patches/kfreebsd_support b/debian/patches/kfreebsd_support
new file mode 100644
index 0000000..1f02052
--- /dev/null
+++ b/debian/patches/kfreebsd_support
@@ -0,0 +1,72 @@
+Index: gambas3/acinclude.m4
+===================================================================
+--- gambas3.orig/acinclude.m4	2013-09-03 12:20:15.763016116 +0200
++++ gambas3/acinclude.m4	2013-09-03 14:26:38.389881429 +0200
+@@ -502,6 +502,17 @@
+       AC_DEFINE(OS_SOLARIS, 1, [Target system is Solaris])
+       AC_DEFINE(SYSTEM, "Solaris", [Operating system])
+       ;;
++    *-*-k*bsd*-gnu )
++      SYSTEM=GNU
++      AC_DEFINE(OS_GNU, 1, [Target system is of GNU family])
++      AC_DEFINE(OS_BSD, 1, [Target system is of BSD family])
++      AC_DEFINE(SYSTEM, "GNU/kFreeBSD", [Operating system])
++      ;;
++    *-*-gnu* )
++      SYSTEM=GNU
++      AC_DEFINE(OS_GNU, 1, [Target system is of GNU family])
++      AC_DEFINE(SYSTEM, "GNU", [Operating system])
++      ;;  
+     *)
+       SYSTEM=UNKNOWN
+       AC_DEFINE(SYSTEM, "unknown", [Operating system])
+Index: gambas3/gb.v4l/src/CWebcam.h
+===================================================================
+--- gambas3.orig/gb.v4l/src/CWebcam.h	2013-09-03 12:19:54.983259418 +0200
++++ gambas3/gb.v4l/src/CWebcam.h	2013-09-03 14:31:31.106213225 +0200
+@@ -31,11 +31,11 @@
+ #include <linux/videodev2.h>
+ #include <libv4lconvert.h>
+ 
+-#ifdef OS_FREEBSD
+-  #include <linux/videodev.h>
+-#else
++#ifdef OS_LINUX
+   #include <linux/types.h>
+   #include "videodev.h"
++#else
++  #include <linux/videodev.h>
+ #endif
+ 
+ #include "gambas.h"
+Index: gambas3/gb.v4l/src/gv4l2.c
+===================================================================
+--- gambas3.orig/gb.v4l/src/gv4l2.c	2013-09-03 12:19:54.983259418 +0200
++++ gambas3/gb.v4l/src/gv4l2.c	2013-09-03 14:33:07.281029549 +0200
+@@ -46,10 +46,10 @@
+ #include "main.h"
+ #include "CWebcam.h"
+ 
+-#ifdef OS_FREEBSD
+-  #include <stdint.h>
+-#else
++#ifdef OS_LINUX
+   #include <asm/types.h>
++#else
++  #include <stdint.h>
+ #endif
+ 
+ //
+Index: gambas3/main/gbc/gbi.c
+===================================================================
+--- gambas3.orig/main/gbc/gbi.c	2013-09-03 12:19:54.995259277 +0200
++++ gambas3/main/gbc/gbi.c	2013-09-03 14:28:32.464439892 +0200
+@@ -42,7 +42,7 @@
+ 
+ #include <dlfcn.h>
+ 
+-#if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_FREEBSD) || defined(OS_CYGWIN)
++#if defined(OS_LINUX) || defined(OS_GNU) || defined(OS_OPENBSD) || defined(OS_FREEBSD) || defined(OS_CYGWIN)
+ 	#define lt_dlinit() (0)
+ 	#define lt_dlhandle void *
+ 	#define lt_dlopenext(_path) dlopen(_path, RTLD_LAZY)
diff --git a/debian/patches/series b/debian/patches/series
index 33c6ee1..ce150f0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 detect_browser_debian
 dont_compile_examples
 fix_typos
+kfreebsd_support

-- 
Gambas 3

