On Tue, Jan 10, 2006 at 03:50:36PM +0100, Amaya wrote: > Hi there, Aurelien Hi!
> Thanks for the patch you sent to this bug report. > I am trying to repackage newest upstream version and your pacth breaks > with it. That's because support for plain FreeBSD has been added in the lastest version and in a different manner than in my patch. Therefore my patch to the old version break things on the new one. > In this URL you will find my efforts to package this, can you please > provide a patch that applies cleanly? Only minor changes might be > needed, but I do not understand the code well enough to change it > myself. > > http://www.amayita.com/debian/xlibs-transition/ Please find attached a new patch, which is more simple than the previous one, as support for plain FreeBSD has been added. Please also note that the package should build-depends on libgtkextra-dev (>= 2.1.1), as the configure script fails with previous version. I also gave a look at gtk+extra. First it fails to build on GNU/kFreeBSD due to outdated libtool and config.{guess,sub}. You will find attached a patch to update those files at build time, that's also remove config.{guess,sub} from the .diff.gz file, and reduce its size. Please also note that libgtkextra-2.1.1_2.1.1-1.1_i386.deb does not contains the lib. It's seems it's because the library is still called libgtkextra-x11-2.0.so. I haven't investigate if the package name or if the library name is wrong. Bye, Aurelien -- .''`. Aurelien Jarno | GPG: 1024D/F1BCDB73 : :' : Debian developer | Electrical Engineer `. `' [EMAIL PROTECTED] | [EMAIL PROTECTED] `- people.debian.org/~aurel32 | www.aurel32.net
--- gpsim-0.21.11.orig/modules/paraface.cc +++ gpsim-0.21.11/modules/paraface.cc @@ -48,7 +48,7 @@ #include <linux/ppdev.h> #endif // linux -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) #include <dev/ppbus/ppi.h> #include <dev/ppbus/ppbconf.h> #endif @@ -429,7 +429,7 @@ #ifdef linux unsigned int ppstatus; #endif // linux -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) u_int8_t ppstatus; #endif // __FreeBSD__ @@ -462,7 +462,7 @@ status&=~0x10; #endif // linux -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) if (ioctl (fd, PPIGSTATUS, &ppstatus) == -1) { perror("ioctl"); } @@ -508,7 +508,7 @@ perror("ioctl"); #endif // linux -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) if(ioctl (fd, PPISDATA, &data)==-1) perror("ioctl"); #endif // __FreeBSD__
diff -u gtk+extra-2.1.1/debian/control gtk+extra-2.1.1/debian/control --- gtk+extra-2.1.1/debian/control +++ gtk+extra-2.1.1/debian/control @@ -3,7 +3,7 @@ Priority: optional Maintainer: Bradley Bell <[EMAIL PROTECTED]> Standards-Version: 3.6.2.0 -Build-Depends: debhelper (>> 4.0.0), libgtk2.0-dev +Build-Depends: debhelper (>> 4.0.0), autotools-dev, automake1.7, libtool, autoconf, libgtk2.0-dev Package: libgtkextra-dev Architecture: any diff -u gtk+extra-2.1.1/debian/rules gtk+extra-2.1.1/debian/rules --- gtk+extra-2.1.1/debian/rules +++ gtk+extra-2.1.1/debian/rules @@ -25,6 +25,9 @@ configure-stamp: dh_testdir + libtoolize -c -f + aclocal-1.7 + autoconf ./configure --prefix=/usr --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info @@ -44,6 +47,7 @@ dh_testroot rm -f build-stamp configure-stamp + rm -f aclocal.m4 config.guess config.sub configure ltmain.sh -$(MAKE) distclean dh_clean