TDE
/
tde-packaging
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix up libr packaging somewhat

Browse Source
pull/3/head
Timothy Pearson 10 years ago
parent d13c79dd95
commit 88e2c685d6
45 changed files with 12 additions and 1500 deletions
Show Stats Download Patch File Download Diff File

4
debian/lenny/dependencies/libr/debian/cron.d.ex vendored
Unescape View File

@ -1,4 +0,0 @@
#
# Regular cron jobs for the libr package
#
0 4 * * * root [ -x /usr/bin/libr_maintenance ] && /usr/bin/libr_maintenance

10
debian/lenny/dependencies/libr/debian/libr.default.ex vendored
Unescape View File

@ -1,10 +0,0 @@
# Defaults for libr initscript
# sourced by /etc/init.d/libr
# installed at /etc/default/libr by the maintainer scripts
#
# This is a POSIX shell fragment
#
# Additional options that are passed to the Daemon.
DAEMON_OPTS=""

24
debian/lenny/dependencies/libr/debian/patches/000-fix-stack-smashing.diff vendored
Unescape View File

@ -1,24 +0,0 @@
diff -ru libr-0.6.0~maverick/src/libr-bfd.h libr-0.6.0/src/libr-bfd.h
--- libr-0.6.0~maverick/src/libr-bfd.h 2009-12-03 18:51:50.000000000 +0000
+++ libr-0.6.0/src/libr-bfd.h 2012-09-12 20:08:35.000000000 +0000
@@ -1,6 +1,8 @@
#ifndef __LIBR_BFD_H
#define __LIBR_BFD_H
+#include "config.h"
+
#include <sys/types.h>
#include <stdint.h>
#include <bfd.h>
diff -ru libr-0.6.0~maverick/src/libr-internal.h libr-0.6.0/src/libr-internal.h
--- libr-0.6.0~maverick/src/libr-internal.h 2010-05-01 19:07:32.000000000 +0000
+++ libr-0.6.0/src/libr-internal.h 2012-09-12 20:08:35.000000000 +0000
@@ -7,7 +7,7 @@
#define EXPORT_FN __attribute__((visibility ("protected")))
#define INTERNAL_FN __attribute__ ((visibility ("internal")))
#define LIBR_TEMPFILE "/tmp/libr-temp.XXXXXX"
-#define LIBR_TEMPFILE_LEN 21
+#define LIBR_TEMPFILE_LEN 22
#ifndef DOXYGEN_SHOULD_SKIP_THIS

56
debian/lenny/dependencies/libr/debian/patches/001-fix-arm-builds.diff vendored
Unescape View File

@ -1,56 +0,0 @@
diff -ru libr-0.6.0~maverick/configure libr-0.6.0/configure
--- libr-0.6.0~maverick/configure 2011-03-05 20:21:12.000000000 +0000
+++ libr-0.6.0/configure 2013-07-19 03:43:01.000000000 +0000
@@ -13072,6 +13072,10 @@
ARCH="i386";
elif test "$UNAMEM" = "i686" ; then
ARCH="i386";
+elif test "$UNAMEM" = "armv5tejl" ; then
+ ARCH="armel";
+elif test "$UNAMEM" = "armv6l" ; then
+ ARCH="armhf";
elif test "$UNAMEM" = "x86_64"; then
ARCH="amd64";
fi
@@ -13083,6 +13087,14 @@
CFLAGS="$CFLAGS -m64";
{ $as_echo "$as_me:${as_lineno-$LINENO}: Ready for 64-bit compilation." >&5
$as_echo "$as_me: Ready for 64-bit compilation." >&6;};
+elif test "$ARCH" = "armel" ; then
+ CFLAGS="$CFLAGS";
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Ready for armel compilation." >&5
+$as_echo "$as_me: Ready for armel compilation." >&6;};
+elif test "$ARCH" = "armhf" ; then
+ CFLAGS="$CFLAGS";
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Ready for armhf compilation." >&5
+$as_echo "$as_me: Ready for armhf compilation." >&6;};
else
as_fn_error $? "Target architecture ${ARCH} is invalid!" "$LINENO" 5 ;
fi
diff -ru libr-0.6.0~maverick/configure.ac libr-0.6.0/configure.ac
--- libr-0.6.0~maverick/configure.ac 2011-03-05 20:20:50.000000000 +0000
+++ libr-0.6.0/configure.ac 2013-07-19 03:41:27.000000000 +0000
@@ -81,6 +81,10 @@
ARCH="i386";
elif test "$UNAMEM" = "i686" ; then
ARCH="i386";
+elif test "$UNAMEM" = "armv5tejl" ; then
+ ARCH="armel";
+elif test "$UNAMEM" = "armv6l" ; then
+ ARCH="armhf";
elif test "$UNAMEM" = "x86_64"; then
ARCH="amd64";
fi
@@ -90,6 +94,12 @@
elif test "$ARCH" = "amd64" ; then
CFLAGS="$CFLAGS -m64";
AC_MSG_NOTICE([Ready for 64-bit compilation.]);
+elif test "$ARCH" = "armel" ; then
+ CFLAGS="$CFLAGS";
+ AC_MSG_NOTICE([Ready for armel compilation.]);
+elif test "$ARCH" = "armhf" ; then
+ CFLAGS="$CFLAGS";
+ AC_MSG_NOTICE([Ready for armhf compilation.]);
else
AC_MSG_ERROR([Target architecture ${ARCH} is invalid!]);
fi

34
debian/lenny/dependencies/libr/debian/patches/002-fix-crash-on-malformed-icon.diff vendored
Unescape View File

@ -1,34 +0,0 @@
diff -ru libr-0.6.0~maverick/src/libr-icons.c libr-0.6.0/src/libr-icons.c
--- libr-0.6.0~maverick/src/libr-icons.c 2011-03-02 22:22:33.000000000 +0000
+++ libr-0.6.0/src/libr-icons.c 2012-09-12 20:08:35.000000000 +0000
@@ -330,18 +330,20 @@
if(entry->type == LIBR_SVG)
{
libr_icon *icon = libr_icon_geticon_byname(handle, entry->name);
- libr_icon *icon_onecanvas;
- char *buffer;
+ if (icon) {
+ libr_icon *icon_onecanvas;
+ char *buffer;
- /* should we report the requested size for SVG? */
- icon->icon_size = iconsize;
+ /* should we report the requested size for SVG? */
+ icon->icon_size = iconsize;
- /* if the SVG is a "one canvas" document then extract the correctly sized icon */
- if((buffer = onecanvas_geticon_bysize(icon->buffer, iconsize)) != NULL)
- {
- libr_icon_close(icon);
- icon_onecanvas = new_icon_handle(LIBR_SVG, iconsize, buffer, strlen(buffer));
- return icon_onecanvas;
+ /* if the SVG is a "one canvas" document then extract the correctly sized icon */
+ if((buffer = onecanvas_geticon_bysize(icon->buffer, iconsize)) != NULL)
+ {
+ libr_icon_close(icon);
+ icon_onecanvas = new_icon_handle(LIBR_SVG, iconsize, buffer, strlen(buffer));
+ return icon_onecanvas;
+ }
}
return icon;
}

12
debian/lenny/dependencies/libr/debian/patches/003-fix-gtk-includes.diff vendored
Unescape View File

@ -1,12 +0,0 @@
diff -ru libr-0.6.0~maverick/src/libr-gtk.c libr-0.6.0/src/libr-gtk.c
--- libr-0.6.0~maverick/src/libr-gtk.c 2009-12-01 23:11:37.000000000 +0000
+++ libr-0.6.0/src/libr-gtk.c 2012-09-12 20:08:35.000000000 +0000
@@ -33,7 +33,7 @@
/* For loading GTK/GDK images */
#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <glib/gthread.h>
+#include <glib.h>
/* For loading GLADE files */
#include <glade/glade.h>

138
debian/lenny/dependencies/libr/debian/patches/004-fix-force-arch.diff vendored
Unescape View File

@ -1,138 +0,0 @@
Index: b/Makefile.in
===================================================================
--- a/Makefile.in
+++ b/Makefile.in
@@ -136,7 +136,6 @@
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AR = @AR@
-ARCH = @ARCH@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
Index: b/configure
===================================================================
--- a/configure
+++ b/configure
@@ -746,7 +746,6 @@
am__EXEEXT_TRUE
LTLIBOBJS
LIBOBJS
-ARCH
BACKEND_PKG
LIBR_BACKEND
BACKEND_NAME
@@ -13062,44 +13061,6 @@
-## Handle target architecture configuration
-UNAMEM=`uname -m`;
-if test "$UNAMEM" = "i386" ; then
- ARCH="i386";
-elif test "$UNAMEM" = "i486" ; then
- ARCH="i386";
-elif test "$UNAMEM" = "i586" ; then
- ARCH="i386";
-elif test "$UNAMEM" = "i686" ; then
- ARCH="i386";
-elif test "$UNAMEM" = "armv5tejl" ; then
- ARCH="armel";
-elif test "$UNAMEM" = "armv6l" ; then
- ARCH="armhf";
-elif test "$UNAMEM" = "x86_64"; then
- ARCH="amd64";
-fi
-if test "$ARCH" = "i386" ; then
- CFLAGS="$CFLAGS -m32";
- { $as_echo "$as_me:${as_lineno-$LINENO}: Ready for 32-bit compilation." >&5
-$as_echo "$as_me: Ready for 32-bit compilation." >&6;};
-elif test "$ARCH" = "amd64" ; then
- CFLAGS="$CFLAGS -m64";
- { $as_echo "$as_me:${as_lineno-$LINENO}: Ready for 64-bit compilation." >&5
-$as_echo "$as_me: Ready for 64-bit compilation." >&6;};
-elif test "$ARCH" = "armel" ; then
- CFLAGS="$CFLAGS";
- { $as_echo "$as_me:${as_lineno-$LINENO}: Ready for armel compilation." >&5
-$as_echo "$as_me: Ready for armel compilation." >&6;};
-elif test "$ARCH" = "armhf" ; then
- CFLAGS="$CFLAGS";
- { $as_echo "$as_me:${as_lineno-$LINENO}: Ready for armhf compilation." >&5
-$as_echo "$as_me: Ready for armhf compilation." >&6;};
-else
- as_fn_error $? "Target architecture ${ARCH} is invalid!" "$LINENO" 5 ;
-fi
-
-## END Handle target architecture configuration
ac_config_headers="$ac_config_headers config.h"
Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
@@ -71,40 +71,6 @@
AC_SUBST(LIBR_BACKEND)
AC_SUBST(BACKEND_PKG)
-## Handle target architecture configuration
-UNAMEM=`uname -m`;
-if test "$UNAMEM" = "i386" ; then
- ARCH="i386";
-elif test "$UNAMEM" = "i486" ; then
- ARCH="i386";
-elif test "$UNAMEM" = "i586" ; then
- ARCH="i386";
-elif test "$UNAMEM" = "i686" ; then
- ARCH="i386";
-elif test "$UNAMEM" = "armv5tejl" ; then
- ARCH="armel";
-elif test "$UNAMEM" = "armv6l" ; then
- ARCH="armhf";
-elif test "$UNAMEM" = "x86_64"; then
- ARCH="amd64";
-fi
-if test "$ARCH" = "i386" ; then
- CFLAGS="$CFLAGS -m32";
- AC_MSG_NOTICE([Ready for 32-bit compilation.]);
-elif test "$ARCH" = "amd64" ; then
- CFLAGS="$CFLAGS -m64";
- AC_MSG_NOTICE([Ready for 64-bit compilation.]);
-elif test "$ARCH" = "armel" ; then
- CFLAGS="$CFLAGS";
- AC_MSG_NOTICE([Ready for armel compilation.]);
-elif test "$ARCH" = "armhf" ; then
- CFLAGS="$CFLAGS";
- AC_MSG_NOTICE([Ready for armhf compilation.]);
-else
- AC_MSG_ERROR([Target architecture ${ARCH} is invalid!]);
-fi
-AC_SUBST(ARCH)
-## END Handle target architecture configuration
AC_CONFIG_HEADERS(config.h)
AC_OUTPUT(
Index: b/man/Makefile.in
===================================================================
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -81,7 +81,6 @@
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AR = @AR@
-ARCH = @ARCH@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
Index: b/src/Makefile.in
===================================================================
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -103,7 +103,6 @@
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AR = @AR@
-ARCH = @ARCH@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@

44
debian/lenny/dependencies/libr/debian/patches/005-fix-arm-mangled-section.diff vendored
Unescape View File

@ -1,44 +0,0 @@
Index: libr-0.6.0/src/libr-bfd.c
===================================================================
--- libr-0.6.0.orig/src/libr-bfd.c 2011-03-02 22:06:52.000000000 +0000
+++ libr-0.6.0/src/libr-bfd.c 2014-03-30 10:57:27.132041406 +0000
@@ -159,7 +159,18 @@
continue; /* Section has been marked for deletion */
}
/* Use SEC_LINKER_CREATED to ask the libbfd backend to take care of configuring the section */
- oscn = bfd_make_section_anyway_with_flags(ohandle, iscn->name, iscn->flags | SEC_LINKER_CREATED);
+
+ // Keep the ARM_ATTRIBUTES section type intact on armhf systems
+ // If this is not done, readelf -A will not print any architecture information for the modified library,
+ // and ldd will report that the library cannot be found
+ if (strcmp(iscn->name, ".ARM.attributes") == 0)
+ {
+ oscn = bfd_make_section_anyway_with_flags(ohandle, iscn->name, iscn->flags);
+ }
+ else
+ {
+ oscn = bfd_make_section_anyway_with_flags(ohandle, iscn->name, iscn->flags | SEC_LINKER_CREATED);
+ }
if(oscn == NULL)
{
printf("failed to create out section: %s\n", bfd_errmsg(bfd_get_error()));
@@ -262,6 +273,7 @@
reloc_count = bfd_canonicalize_reloc(ihandle, iscn, reloc_buffer, symtab_buffer);
bfd_set_reloc(ohandle, oscn, reloc_buffer, reloc_count);
}
+
if(bfd_get_section_flags(ihandle, iscn) & SEC_HAS_CONTENTS)
{
/* NOTE: if the section is just being copied then do that, otherwise grab
@@ -286,6 +298,11 @@
return false;
}
free(buffer);
+ if(!bfd_copy_private_section_data(ihandle, iscn, ohandle, oscn))
+ {
+ printf("failed to copy private section data: %s\n", bfd_errmsg(bfd_get_error()));
+ return false;
+ }
}
}
if(!bfd_copy_private_bfd_data(ihandle, ohandle))

6
debian/lenny/dependencies/libr/debian/patches/series vendored
Unescape View File

@ -1,6 +0,0 @@
000-fix-stack-smashing.diff
001-fix-arm-builds.diff
002-fix-crash-on-malformed-icon.diff
003-fix-gtk-includes.diff
004-fix-force-arch.diff
005-fix-arm-mangled-section.diff

39
debian/lenny/dependencies/libr/debian/postinst.ex vendored
Unescape View File

@ -1,39 +0,0 @@
#!/bin/sh
# postinst script for libr
#
# see: dh_installdeb(1)
set -e
# summary of how this script can be called:
# * <postinst> `configure' <most-recently-configured-version>
# * <old-postinst> `abort-upgrade' <new version>
# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
# <new-version>
# * <postinst> `abort-remove'
# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
# <failed-install-package> <version> `removing'
# <conflicting-package> <version>
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
case "$1" in
configure)
;;
abort-upgrade|abort-remove|abort-deconfigure)
;;
*)
echo "postinst called with unknown argument \`$1'" >&2
exit 1
;;
esac
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
#DEBHELPER#
exit 0

37
debian/lenny/dependencies/libr/debian/postrm.ex vendored
Unescape View File

@ -1,37 +0,0 @@
#!/bin/sh
# postrm script for libr
#
# see: dh_installdeb(1)
set -e
# summary of how this script can be called:
# * <postrm> `remove'
# * <postrm> `purge'
# * <old-postrm> `upgrade' <new-version>
# * <new-postrm> `failed-upgrade' <old-version>
# * <new-postrm> `abort-install'
# * <new-postrm> `abort-install' <old-version>
# * <new-postrm> `abort-upgrade' <old-version>
# * <disappearer's-postrm> `disappear' <overwriter>
# <overwriter-version>
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
case "$1" in
purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
;;
*)
echo "postrm called with unknown argument \`$1'" >&2
exit 1
;;
esac
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
#DEBHELPER#
exit 0

35
debian/lenny/dependencies/libr/debian/preinst.ex vendored
Unescape View File

@ -1,35 +0,0 @@
#!/bin/sh
# preinst script for libr
#
# see: dh_installdeb(1)
set -e
# summary of how this script can be called:
# * <new-preinst> `install'
# * <new-preinst> `install' <old-version>
# * <new-preinst> `upgrade' <old-version>
# * <old-preinst> `abort-upgrade' <new-version>
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
case "$1" in
install|upgrade)
;;
abort-upgrade)
;;
*)
echo "preinst called with unknown argument \`$1'" >&2
exit 1
;;
esac
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
#DEBHELPER#
exit 0

38
debian/lenny/dependencies/libr/debian/prerm.ex vendored
Unescape View File

@ -1,38 +0,0 @@
#!/bin/sh
# prerm script for libr
#
# see: dh_installdeb(1)
set -e
# summary of how this script can be called:
# * <prerm> `remove'
# * <old-prerm> `upgrade' <new-version>
# * <new-prerm> `failed-upgrade' <old-version>
# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
# * <deconfigured's-prerm> `deconfigure' `in-favour'
# <package-being-installed> <version> `removing'
# <conflicting-package> <version>
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
case "$1" in
remove|upgrade|deconfigure)
;;
failed-upgrade)
;;
*)
echo "prerm called with unknown argument \`$1'" >&2
exit 1
;;
esac
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
#DEBHELPER#
exit 0

4
debian/lenny/dependencies/libr/debian/rules vendored
Unescape View File

@ -41,6 +41,10 @@ endif
ifneq "$(wildcard /usr/share/misc/config.guess)" "" ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess config.guess cp -f /usr/share/misc/config.guess config.guess
endif endif
cp -Rp /usr/share/aclocal/libtool.m4 libtool.m4.in
cp -Rp /usr/share/libtool/config/ltmain.sh ltmain.sh
autoconf
automake
./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" ./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"

23
debian/lenny/dependencies/libr/debian/watch.ex vendored
Unescape View File

@ -1,23 +0,0 @@
# Example watch control file for uscan
# Rename this file to "watch" and then you can run the "uscan" command
# to check for upstream updates and more.
# See uscan(1) for format
# Compulsory line, this is a version 3 file
version=3
# Uncomment to examine a Webpage
# <Webpage URL> <string match>
#http://www.example.com/downloads.php libr-(.*)\.tar\.gz
# Uncomment to examine a Webserver directory
#http://www.example.com/pub/libr-(.*)\.tar\.gz
# Uncommment to examine a FTP server
#ftp://ftp.example.com/pub/libr-(.*)\.tar\.gz debian uupdate
# Uncomment to find new files on sourceforge, for devscripts >= 2.9
# http://sf.net/libr/libr-(.*)\.tar\.gz
# Uncomment to find new files on GooglePages
# http://example.googlepages.com/foo.html libr-(.*)\.tar\.gz

4
debian/squeeze/dependencies/libr/debian/cron.d.ex vendored
Unescape View File

@ -1,4 +0,0 @@
#
# Regular cron jobs for the libr package
#
0 4 * * * root [ -x /usr/bin/libr_maintenance ] && /usr/bin/libr_maintenance

10
debian/squeeze/dependencies/libr/debian/libr.default.ex vendored
Unescape View File

@ -1,10 +0,0 @@
# Defaults for libr initscript
# sourced by /etc/init.d/libr
# installed at /etc/default/libr by the maintainer scripts
#
# This is a POSIX shell fragment
#
# Additional options that are passed to the Daemon.
DAEMON_OPTS=""

24
debian/squeeze/dependencies/libr/debian/patches/000-fix-stack-smashing.diff vendored
Unescape View File

@ -1,24 +0,0 @@
diff -ru libr-0.6.0~maverick/src/libr-bfd.h libr-0.6.0/src/libr-bfd.h
--- libr-0.6.0~maverick/src/libr-bfd.h 2009-12-03 18:51:50.000000000 +0000
+++ libr-0.6.0/src/libr-bfd.h 2012-09-12 20:08:35.000000000 +0000
@@ -1,6 +1,8 @@
#ifndef __LIBR_BFD_H
#define __LIBR_BFD_H
+#include "config.h"
+
#include <sys/types.h>
#include <stdint.h>
#include <bfd.h>
diff -ru libr-0.6.0~maverick/src/libr-internal.h libr-0.6.0/src/libr-internal.h
--- libr-0.6.0~maverick/src/libr-internal.h 2010-05-01 19:07:32.000000000 +0000
+++ libr-0.6.0/src/libr-internal.h 2012-09-12 20:08:35.000000000 +0000
@@ -7,7 +7,7 @@
#define EXPORT_FN __attribute__((visibility ("protected")))
#define INTERNAL_FN __attribute__ ((visibility ("internal")))
#define LIBR_TEMPFILE "/tmp/libr-temp.XXXXXX"
-#define LIBR_TEMPFILE_LEN 21
+#define LIBR_TEMPFILE_LEN 22
#ifndef DOXYGEN_SHOULD_SKIP_THIS

56
debian/squeeze/dependencies/libr/debian/patches/001-fix-arm-builds.diff vendored
Unescape View File

@ -1,56 +0,0 @@
diff -ru libr-0.6.0~maverick/configure libr-0.6.0/configure
--- libr-0.6.0~maverick/configure 2011-03-05 20:21:12.000000000 +0000
+++ libr-0.6.0/configure 2013-07-19 03:43:01.000000000 +0000
@@ -13072,6 +13072,10 @@
ARCH="i386";
elif test "$UNAMEM" = "i686" ; then
ARCH="i386";
+elif test "$UNAMEM" = "armv5tejl" ; then
+ ARCH="armel";
+elif test "$UNAMEM" = "armv6l" ; then
+ ARCH="armhf";
elif test "$UNAMEM" = "x86_64"; then
ARCH="amd64";
fi
@@ -13083,6 +13087,14 @@
CFLAGS="$CFLAGS -m64";
{ $as_echo "$as_me:${as_lineno-$LINENO}: Ready for 64-bit compilation." >&5
$as_echo "$as_me: Ready for 64-bit compilation." >&6;};
+elif test "$ARCH" = "armel" ; then
+ CFLAGS="$CFLAGS";
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Ready for armel compilation." >&5
+$as_echo "$as_me: Ready for armel compilation." >&6;};
+elif test "$ARCH" = "armhf" ; then
+ CFLAGS="$CFLAGS";
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Ready for armhf compilation." >&5
+$as_echo "$as_me: Ready for armhf compilation." >&6;};
else
as_fn_error $? "Target architecture ${ARCH} is invalid!" "$LINENO" 5 ;
fi
diff -ru libr-0.6.0~maverick/configure.ac libr-0.6.0/configure.ac
--- libr-0.6.0~maverick/configure.ac 2011-03-05 20:20:50.000000000 +0000
+++ libr-0.6.0/configure.ac 2013-07-19 03:41:27.000000000 +0000
@@ -81,6 +81,10 @@
ARCH="i386";
elif test "$UNAMEM" = "i686" ; then
ARCH="i386";
+elif test "$UNAMEM" = "armv5tejl" ; then
+ ARCH="armel";
+elif test "$UNAMEM" = "armv6l" ; then
+ ARCH="armhf";
elif test "$UNAMEM" = "x86_64"; then
ARCH="amd64";
fi
@@ -90,6 +94,12 @@
elif test "$ARCH" = "amd64" ; then
CFLAGS="$CFLAGS -m64";
AC_MSG_NOTICE([Ready for 64-bit compilation.]);
+elif test "$ARCH" = "armel" ; then
+ CFLAGS="$CFLAGS";
+ AC_MSG_NOTICE([Ready for armel compilation.]);
+elif test "$ARCH" = "armhf" ; then
+ CFLAGS="$CFLAGS";
+ AC_MSG_NOTICE([Ready for armhf compilation.]);
else
AC_MSG_ERROR([Target architecture ${ARCH} is invalid!]);
fi

34
debian/squeeze/dependencies/libr/debian/patches/002-fix-crash-on-malformed-icon.diff vendored
Unescape View File

@ -1,34 +0,0 @@
diff -ru libr-0.6.0~maverick/src/libr-icons.c libr-0.6.0/src/libr-icons.c
--- libr-0.6.0~maverick/src/libr-icons.c 2011-03-02 22:22:33.000000000 +0000
+++ libr-0.6.0/src/libr-icons.c 2012-09-12 20:08:35.000000000 +0000
@@ -330,18 +330,20 @@
if(entry->type == LIBR_SVG)
{
libr_icon *icon = libr_icon_geticon_byname(handle, entry->name);
- libr_icon *icon_onecanvas;
- char *buffer;
+ if (icon) {
+ libr_icon *icon_onecanvas;
+ char *buffer;
- /* should we report the requested size for SVG? */
- icon->icon_size = iconsize;
+ /* should we report the requested size for SVG? */
+ icon->icon_size = iconsize;
- /* if the SVG is a "one canvas" document then extract the correctly sized icon */
- if((buffer = onecanvas_geticon_bysize(icon->buffer, iconsize)) != NULL)
- {
- libr_icon_close(icon);
- icon_onecanvas = new_icon_handle(LIBR_SVG, iconsize, buffer, strlen(buffer));
- return icon_onecanvas;
+ /* if the SVG is a "one canvas" document then extract the correctly sized icon */
+ if((buffer = onecanvas_geticon_bysize(icon->buffer, iconsize)) != NULL)
+ {
+ libr_icon_close(icon);
+ icon_onecanvas = new_icon_handle(LIBR_SVG, iconsize, buffer, strlen(buffer));
+ return icon_onecanvas;
+ }
}
return icon;
}

12
debian/squeeze/dependencies/libr/debian/patches/003-fix-gtk-includes.diff vendored
Unescape View File

@ -1,12 +0,0 @@
diff -ru libr-0.6.0~maverick/src/libr-gtk.c libr-0.6.0/src/libr-gtk.c
--- libr-0.6.0~maverick/src/libr-gtk.c 2009-12-01 23:11:37.000000000 +0000
+++ libr-0.6.0/src/libr-gtk.c 2012-09-12 20:08:35.000000000 +0000
@@ -33,7 +33,7 @@
/* For loading GTK/GDK images */
#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <glib/gthread.h>
+#include <glib.h>
/* For loading GLADE files */
#include <glade/glade.h>

138
debian/squeeze/dependencies/libr/debian/patches/004-fix-force-arch.diff vendored
Unescape View File

@ -1,138 +0,0 @@
Index: b/Makefile.in
===================================================================
--- a/Makefile.in
+++ b/Makefile.in
@@ -136,7 +136,6 @@
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AR = @AR@
-ARCH = @ARCH@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
Index: b/configure
===================================================================
--- a/configure
+++ b/configure
@@ -746,7 +746,6 @@
am__EXEEXT_TRUE
LTLIBOBJS
LIBOBJS
-ARCH
BACKEND_PKG
LIBR_BACKEND
BACKEND_NAME
@@ -13062,44 +13061,6 @@
-## Handle target architecture configuration
-UNAMEM=`uname -m`;
-if test "$UNAMEM" = "i386" ; then
- ARCH="i386";
-elif test "$UNAMEM" = "i486" ; then
- ARCH="i386";
-elif test "$UNAMEM" = "i586" ; then
- ARCH="i386";
-elif test "$UNAMEM" = "i686" ; then
- ARCH="i386";
-elif test "$UNAMEM" = "armv5tejl" ; then
- ARCH="armel";
-elif test "$UNAMEM" = "armv6l" ; then
- ARCH="armhf";
-elif test "$UNAMEM" = "x86_64"; then
- ARCH="amd64";
-fi
-if test "$ARCH" = "i386" ; then
- CFLAGS="$CFLAGS -m32";
- { $as_echo "$as_me:${as_lineno-$LINENO}: Ready for 32-bit compilation." >&5
-$as_echo "$as_me: Ready for 32-bit compilation." >&6;};
-elif test "$ARCH" = "amd64" ; then
- CFLAGS="$CFLAGS -m64";
- { $as_echo "$as_me:${as_lineno-$LINENO}: Ready for 64-bit compilation." >&5
-$as_echo "$as_me: Ready for 64-bit compilation." >&6;};
-elif test "$ARCH" = "armel" ; then
- CFLAGS="$CFLAGS";
- { $as_echo "$as_me:${as_lineno-$LINENO}: Ready for armel compilation." >&5
-$as_echo "$as_me: Ready for armel compilation." >&6;};
-elif test "$ARCH" = "armhf" ; then
- CFLAGS="$CFLAGS";
- { $as_echo "$as_me:${as_lineno-$LINENO}: Ready for armhf compilation." >&5
-$as_echo "$as_me: Ready for armhf compilation." >&6;};
-else
- as_fn_error $? "Target architecture ${ARCH} is invalid!" "$LINENO" 5 ;
-fi
-
-## END Handle target architecture configuration
ac_config_headers="$ac_config_headers config.h"
Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
@@ -71,40 +71,6 @@
AC_SUBST(LIBR_BACKEND)
AC_SUBST(BACKEND_PKG)
-## Handle target architecture configuration
-UNAMEM=`uname -m`;
-if test "$UNAMEM" = "i386" ; then
- ARCH="i386";
-elif test "$UNAMEM" = "i486" ; then
- ARCH="i386";
-elif test "$UNAMEM" = "i586" ; then
- ARCH="i386";
-elif test "$UNAMEM" = "i686" ; then
- ARCH="i386";
-elif test "$UNAMEM" = "armv5tejl" ; then
- ARCH="armel";
-elif test "$UNAMEM" = "armv6l" ; then
- ARCH="armhf";
-elif test "$UNAMEM" = "x86_64"; then
- ARCH="amd64";
-fi
-if test "$ARCH" = "i386" ; then
- CFLAGS="$CFLAGS -m32";
- AC_MSG_NOTICE([Ready for 32-bit compilation.]);
-elif test "$ARCH" = "amd64" ; then
- CFLAGS="$CFLAGS -m64";
- AC_MSG_NOTICE([Ready for 64-bit compilation.]);
-elif test "$ARCH" = "armel" ; then
- CFLAGS="$CFLAGS";
- AC_MSG_NOTICE([Ready for armel compilation.]);
-elif test "$ARCH" = "armhf" ; then
- CFLAGS="$CFLAGS";
- AC_MSG_NOTICE([Ready for armhf compilation.]);
-else
- AC_MSG_ERROR([Target architecture ${ARCH} is invalid!]);
-fi
-AC_SUBST(ARCH)
-## END Handle target architecture configuration
AC_CONFIG_HEADERS(config.h)
AC_OUTPUT(
Index: b/man/Makefile.in
===================================================================
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -81,7 +81,6 @@
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AR = @AR@
-ARCH = @ARCH@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
Index: b/src/Makefile.in
===================================================================
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -103,7 +103,6 @@
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AR = @AR@
-ARCH = @ARCH@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@

44
debian/squeeze/dependencies/libr/debian/patches/005-fix-arm-mangled-section.diff vendored
Unescape View File

@ -1,44 +0,0 @@
Index: libr-0.6.0/src/libr-bfd.c
===================================================================
--- libr-0.6.0.orig/src/libr-bfd.c 2011-03-02 22:06:52.000000000 +0000
+++ libr-0.6.0/src/libr-bfd.c 2014-03-30 10:57:27.132041406 +0000
@@ -159,7 +159,18 @@
continue; /* Section has been marked for deletion */
}
/* Use SEC_LINKER_CREATED to ask the libbfd backend to take care of configuring the section */
- oscn = bfd_make_section_anyway_with_flags(ohandle, iscn->name, iscn->flags | SEC_LINKER_CREATED);
+
+ // Keep the ARM_ATTRIBUTES section type intact on armhf systems
+ // If this is not done, readelf -A will not print any architecture information for the modified library,
+ // and ldd will report that the library cannot be found
+ if (strcmp(iscn->name, ".ARM.attributes") == 0)
+ {
+ oscn = bfd_make_section_anyway_with_flags(ohandle, iscn->name, iscn->flags);
+ }
+ else
+ {
+ oscn = bfd_make_section_anyway_with_flags(ohandle, iscn->name, iscn->flags | SEC_LINKER_CREATED);
+ }
if(oscn == NULL)
{
printf("failed to create out section: %s\n", bfd_errmsg(bfd_get_error()));
@@ -262,6 +273,7 @@
reloc_count = bfd_canonicalize_reloc(ihandle, iscn, reloc_buffer, symtab_buffer);
bfd_set_reloc(ohandle, oscn, reloc_buffer, reloc_count);
}
+
if(bfd_get_section_flags(ihandle, iscn) & SEC_HAS_CONTENTS)
{
/* NOTE: if the section is just being copied then do that, otherwise grab
@@ -286,6 +298,11 @@
return false;
}
free(buffer);
+ if(!bfd_copy_private_section_data(ihandle, iscn, ohandle, oscn))
+ {
+ printf("failed to copy private section data: %s\n", bfd_errmsg(bfd_get_error()));
+ return false;
+ }
}
}
if(!bfd_copy_private_bfd_data(ihandle, ohandle))

6
debian/squeeze/dependencies/libr/debian/patches/series vendored
Unescape View File

@ -1,6 +0,0 @@
000-fix-stack-smashing.diff
001-fix-arm-builds.diff
002-fix-crash-on-malformed-icon.diff
003-fix-gtk-includes.diff
004-fix-force-arch.diff
005-fix-arm-mangled-section.diff

39
debian/squeeze/dependencies/libr/debian/postinst.ex vendored
Unescape View File

@ -1,39 +0,0 @@
#!/bin/sh
# postinst script for libr
#
# see: dh_installdeb(1)
set -e
# summary of how this script can be called:
# * <postinst> `configure' <most-recently-configured-version>
# * <old-postinst> `abort-upgrade' <new version>
# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
# <new-version>
# * <postinst> `abort-remove'
# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
# <failed-install-package> <version> `removing'
# <conflicting-package> <version>
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
case "$1" in
configure)
;;
abort-upgrade|abort-remove|abort-deconfigure)
;;
*)
echo "postinst called with unknown argument \`$1'" >&2
exit 1
;;
esac
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
#DEBHELPER#
exit 0

37
debian/squeeze/dependencies/libr/debian/postrm.ex vendored
Unescape View File

@ -1,37 +0,0 @@
#!/bin/sh
# postrm script for libr
#
# see: dh_installdeb(1)
set -e
# summary of how this script can be called:
# * <postrm> `remove'
# * <postrm> `purge'
# * <old-postrm> `upgrade' <new-version>
# * <new-postrm> `failed-upgrade' <old-version>
# * <new-postrm> `abort-install'
# * <new-postrm> `abort-install' <old-version>
# * <new-postrm> `abort-upgrade' <old-version>
# * <disappearer's-postrm> `disappear' <overwriter>
# <overwriter-version>
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
case "$1" in
purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
;;
*)
echo "postrm called with unknown argument \`$1'" >&2
exit 1
;;
esac
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
#DEBHELPER#
exit 0

35
debian/squeeze/dependencies/libr/debian/preinst.ex vendored
Unescape View File

@ -1,35 +0,0 @@
#!/bin/sh
# preinst script for libr
#
# see: dh_installdeb(1)
set -e
# summary of how this script can be called:
# * <new-preinst> `install'
# * <new-preinst> `install' <old-version>
# * <new-preinst> `upgrade' <old-version>
# * <old-preinst> `abort-upgrade' <new-version>
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
case "$1" in
install|upgrade)
;;
abort-upgrade)
;;
*)
echo "preinst called with unknown argument \`$1'" >&2
exit 1
;;
esac
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
#DEBHELPER#
exit 0

38
debian/squeeze/dependencies/libr/debian/prerm.ex vendored
Unescape View File

@ -1,38 +0,0 @@
#!/bin/sh
# prerm script for libr
#
# see: dh_installdeb(1)
set -e
# summary of how this script can be called:
# * <prerm> `remove'
# * <old-prerm> `upgrade' <new-version>
# * <new-prerm> `failed-upgrade' <old-version>
# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
# * <deconfigured's-prerm> `deconfigure' `in-favour'
# <package-being-installed> <version> `removing'
# <conflicting-package> <version>
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
case "$1" in
remove|upgrade|deconfigure)
;;
failed-upgrade)
;;
*)
echo "prerm called with unknown argument \`$1'" >&2
exit 1
;;
esac
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
#DEBHELPER#
exit 0

4
debian/squeeze/dependencies/libr/debian/rules vendored
Unescape View File

@ -41,6 +41,10 @@ endif
ifneq "$(wildcard /usr/share/misc/config.guess)" "" ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess config.guess cp -f /usr/share/misc/config.guess config.guess
endif endif
cp -Rp /usr/share/aclocal/libtool.m4 libtool.m4.in
cp -Rp /usr/share/libtool/config/ltmain.sh ltmain.sh
autoconf
automake
./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" ./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"

23
debian/squeeze/dependencies/libr/debian/watch.ex vendored
Unescape View File

@ -1,23 +0,0 @@
# Example watch control file for uscan
# Rename this file to "watch" and then you can run the "uscan" command
# to check for upstream updates and more.
# See uscan(1) for format
# Compulsory line, this is a version 3 file
version=3
# Uncomment to examine a Webpage
# <Webpage URL> <string match>
#http://www.example.com/downloads.php libr-(.*)\.tar\.gz
# Uncomment to examine a Webserver directory
#http://www.example.com/pub/libr-(.*)\.tar\.gz
# Uncommment to examine a FTP server
#ftp://ftp.example.com/pub/libr-(.*)\.tar\.gz debian uupdate
# Uncomment to find new files on sourceforge, for devscripts >= 2.9
# http://sf.net/libr/libr-(.*)\.tar\.gz
# Uncomment to find new files on GooglePages
# http://example.googlepages.com/foo.html libr-(.*)\.tar\.gz

4
ubuntu/maverick/dependencies/libr/debian/cron.d.ex
Unescape View File

@ -1,4 +0,0 @@
#
# Regular cron jobs for the libr package
#
0 4 * * * root [ -x /usr/bin/libr_maintenance ] && /usr/bin/libr_maintenance

10
ubuntu/maverick/dependencies/libr/debian/libr.default.ex
Unescape View File

@ -1,10 +0,0 @@
# Defaults for libr initscript
# sourced by /etc/init.d/libr
# installed at /etc/default/libr by the maintainer scripts
#
# This is a POSIX shell fragment
#
# Additional options that are passed to the Daemon.
DAEMON_OPTS=""

24
ubuntu/maverick/dependencies/libr/debian/patches/000-fix-stack-smashing.diff
Unescape View File

@ -1,24 +0,0 @@
diff -ru libr-0.6.0~maverick/src/libr-bfd.h libr-0.6.0/src/libr-bfd.h
--- libr-0.6.0~maverick/src/libr-bfd.h 2009-12-03 18:51:50.000000000 +0000
+++ libr-0.6.0/src/libr-bfd.h 2012-09-12 20:08:35.000000000 +0000
@@ -1,6 +1,8 @@
#ifndef __LIBR_BFD_H
#define __LIBR_BFD_H
+#include "config.h"
+
#include <sys/types.h>
#include <stdint.h>
#include <bfd.h>
diff -ru libr-0.6.0~maverick/src/libr-internal.h libr-0.6.0/src/libr-internal.h
--- libr-0.6.0~maverick/src/libr-internal.h 2010-05-01 19:07:32.000000000 +0000
+++ libr-0.6.0/src/libr-internal.h 2012-09-12 20:08:35.000000000 +0000
@@ -7,7 +7,7 @@
#define EXPORT_FN __attribute__((visibility ("protected")))
#define INTERNAL_FN __attribute__ ((visibility ("internal")))
#define LIBR_TEMPFILE "/tmp/libr-temp.XXXXXX"
-#define LIBR_TEMPFILE_LEN 21
+#define LIBR_TEMPFILE_LEN 22
#ifndef DOXYGEN_SHOULD_SKIP_THIS

56
ubuntu/maverick/dependencies/libr/debian/patches/001-fix-arm-builds.diff
Unescape View File

@ -1,56 +0,0 @@
diff -ru libr-0.6.0~maverick/configure libr-0.6.0/configure
--- libr-0.6.0~maverick/configure 2011-03-05 20:21:12.000000000 +0000
+++ libr-0.6.0/configure 2013-07-19 03:43:01.000000000 +0000
@@ -13072,6 +13072,10 @@
ARCH="i386";
elif test "$UNAMEM" = "i686" ; then
ARCH="i386";
+elif test "$UNAMEM" = "armv5tejl" ; then
+ ARCH="armel";
+elif test "$UNAMEM" = "armv6l" ; then
+ ARCH="armhf";
elif test "$UNAMEM" = "x86_64"; then
ARCH="amd64";
fi
@@ -13083,6 +13087,14 @@
CFLAGS="$CFLAGS -m64";
{ $as_echo "$as_me:${as_lineno-$LINENO}: Ready for 64-bit compilation." >&5
$as_echo "$as_me: Ready for 64-bit compilation." >&6;};
+elif test "$ARCH" = "armel" ; then
+ CFLAGS="$CFLAGS";
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Ready for armel compilation." >&5
+$as_echo "$as_me: Ready for armel compilation." >&6;};
+elif test "$ARCH" = "armhf" ; then
+ CFLAGS="$CFLAGS";
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Ready for armhf compilation." >&5
+$as_echo "$as_me: Ready for armhf compilation." >&6;};
else
as_fn_error $? "Target architecture ${ARCH} is invalid!" "$LINENO" 5 ;
fi
diff -ru libr-0.6.0~maverick/configure.ac libr-0.6.0/configure.ac
--- libr-0.6.0~maverick/configure.ac 2011-03-05 20:20:50.000000000 +0000
+++ libr-0.6.0/configure.ac 2013-07-19 03:41:27.000000000 +0000
@@ -81,6 +81,10 @@
ARCH="i386";
elif test "$UNAMEM" = "i686" ; then
ARCH="i386";
+elif test "$UNAMEM" = "armv5tejl" ; then
+ ARCH="armel";
+elif test "$UNAMEM" = "armv6l" ; then
+ ARCH="armhf";
elif test "$UNAMEM" = "x86_64"; then
ARCH="amd64";
fi
@@ -90,6 +94,12 @@
elif test "$ARCH" = "amd64" ; then
CFLAGS="$CFLAGS -m64";
AC_MSG_NOTICE([Ready for 64-bit compilation.]);
+elif test "$ARCH" = "armel" ; then
+ CFLAGS="$CFLAGS";
+ AC_MSG_NOTICE([Ready for armel compilation.]);
+elif test "$ARCH" = "armhf" ; then
+ CFLAGS="$CFLAGS";
+ AC_MSG_NOTICE([Ready for armhf compilation.]);
else
AC_MSG_ERROR([Target architecture ${ARCH} is invalid!]);
fi

34
ubuntu/maverick/dependencies/libr/debian/patches/002-fix-crash-on-malformed-icon.diff
Unescape View File

@ -1,34 +0,0 @@
diff -ru libr-0.6.0~maverick/src/libr-icons.c libr-0.6.0/src/libr-icons.c
--- libr-0.6.0~maverick/src/libr-icons.c 2011-03-02 22:22:33.000000000 +0000
+++ libr-0.6.0/src/libr-icons.c 2012-09-12 20:08:35.000000000 +0000
@@ -330,18 +330,20 @@
if(entry->type == LIBR_SVG)
{
libr_icon *icon = libr_icon_geticon_byname(handle, entry->name);
- libr_icon *icon_onecanvas;
- char *buffer;
+ if (icon) {
+ libr_icon *icon_onecanvas;
+ char *buffer;
- /* should we report the requested size for SVG? */
- icon->icon_size = iconsize;
+ /* should we report the requested size for SVG? */
+ icon->icon_size = iconsize;
- /* if the SVG is a "one canvas" document then extract the correctly sized icon */
- if((buffer = onecanvas_geticon_bysize(icon->buffer, iconsize)) != NULL)
- {
- libr_icon_close(icon);
- icon_onecanvas = new_icon_handle(LIBR_SVG, iconsize, buffer, strlen(buffer));
- return icon_onecanvas;
+ /* if the SVG is a "one canvas" document then extract the correctly sized icon */
+ if((buffer = onecanvas_geticon_bysize(icon->buffer, iconsize)) != NULL)
+ {
+ libr_icon_close(icon);
+ icon_onecanvas = new_icon_handle(LIBR_SVG, iconsize, buffer, strlen(buffer));
+ return icon_onecanvas;
+ }
}
return icon;
}

12
ubuntu/maverick/dependencies/libr/debian/patches/003-fix-gtk-includes.diff
Unescape View File

@ -1,12 +0,0 @@
diff -ru libr-0.6.0~maverick/src/libr-gtk.c libr-0.6.0/src/libr-gtk.c
--- libr-0.6.0~maverick/src/libr-gtk.c 2009-12-01 23:11:37.000000000 +0000
+++ libr-0.6.0/src/libr-gtk.c 2012-09-12 20:08:35.000000000 +0000
@@ -33,7 +33,7 @@
/* For loading GTK/GDK images */
#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <glib/gthread.h>
+#include <glib.h>
/* For loading GLADE files */
#include <glade/glade.h>

138
ubuntu/maverick/dependencies/libr/debian/patches/004-fix-force-arch.diff
Unescape View File

@ -1,138 +0,0 @@
Index: b/Makefile.in
===================================================================
--- a/Makefile.in
+++ b/Makefile.in
@@ -136,7 +136,6 @@
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AR = @AR@
-ARCH = @ARCH@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
Index: b/configure
===================================================================
--- a/configure
+++ b/configure
@@ -746,7 +746,6 @@
am__EXEEXT_TRUE
LTLIBOBJS
LIBOBJS
-ARCH
BACKEND_PKG
LIBR_BACKEND
BACKEND_NAME
@@ -13062,44 +13061,6 @@
-## Handle target architecture configuration
-UNAMEM=`uname -m`;
-if test "$UNAMEM" = "i386" ; then
- ARCH="i386";
-elif test "$UNAMEM" = "i486" ; then
- ARCH="i386";
-elif test "$UNAMEM" = "i586" ; then
- ARCH="i386";
-elif test "$UNAMEM" = "i686" ; then
- ARCH="i386";
-elif test "$UNAMEM" = "armv5tejl" ; then
- ARCH="armel";
-elif test "$UNAMEM" = "armv6l" ; then
- ARCH="armhf";
-elif test "$UNAMEM" = "x86_64"; then
- ARCH="amd64";
-fi
-if test "$ARCH" = "i386" ; then
- CFLAGS="$CFLAGS -m32";
- { $as_echo "$as_me:${as_lineno-$LINENO}: Ready for 32-bit compilation." >&5
-$as_echo "$as_me: Ready for 32-bit compilation." >&6;};
-elif test "$ARCH" = "amd64" ; then
- CFLAGS="$CFLAGS -m64";
- { $as_echo "$as_me:${as_lineno-$LINENO}: Ready for 64-bit compilation." >&5
-$as_echo "$as_me: Ready for 64-bit compilation." >&6;};
-elif test "$ARCH" = "armel" ; then
- CFLAGS="$CFLAGS";
- { $as_echo "$as_me:${as_lineno-$LINENO}: Ready for armel compilation." >&5
-$as_echo "$as_me: Ready for armel compilation." >&6;};
-elif test "$ARCH" = "armhf" ; then
- CFLAGS="$CFLAGS";
- { $as_echo "$as_me:${as_lineno-$LINENO}: Ready for armhf compilation." >&5
-$as_echo "$as_me: Ready for armhf compilation." >&6;};
-else
- as_fn_error $? "Target architecture ${ARCH} is invalid!" "$LINENO" 5 ;
-fi
-
-## END Handle target architecture configuration
ac_config_headers="$ac_config_headers config.h"
Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
@@ -71,40 +71,6 @@
AC_SUBST(LIBR_BACKEND)
AC_SUBST(BACKEND_PKG)
-## Handle target architecture configuration
-UNAMEM=`uname -m`;
-if test "$UNAMEM" = "i386" ; then
- ARCH="i386";
-elif test "$UNAMEM" = "i486" ; then
- ARCH="i386";
-elif test "$UNAMEM" = "i586" ; then
- ARCH="i386";
-elif test "$UNAMEM" = "i686" ; then
- ARCH="i386";
-elif test "$UNAMEM" = "armv5tejl" ; then
- ARCH="armel";
-elif test "$UNAMEM" = "armv6l" ; then
- ARCH="armhf";
-elif test "$UNAMEM" = "x86_64"; then
- ARCH="amd64";
-fi
-if test "$ARCH" = "i386" ; then
- CFLAGS="$CFLAGS -m32";
- AC_MSG_NOTICE([Ready for 32-bit compilation.]);
-elif test "$ARCH" = "amd64" ; then
- CFLAGS="$CFLAGS -m64";
- AC_MSG_NOTICE([Ready for 64-bit compilation.]);
-elif test "$ARCH" = "armel" ; then
- CFLAGS="$CFLAGS";
- AC_MSG_NOTICE([Ready for armel compilation.]);
-elif test "$ARCH" = "armhf" ; then
- CFLAGS="$CFLAGS";
- AC_MSG_NOTICE([Ready for armhf compilation.]);
-else
- AC_MSG_ERROR([Target architecture ${ARCH} is invalid!]);
-fi
-AC_SUBST(ARCH)
-## END Handle target architecture configuration
AC_CONFIG_HEADERS(config.h)
AC_OUTPUT(
Index: b/man/Makefile.in
===================================================================
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -81,7 +81,6 @@
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AR = @AR@
-ARCH = @ARCH@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
Index: b/src/Makefile.in
===================================================================
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -103,7 +103,6 @@
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AR = @AR@
-ARCH = @ARCH@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@

44
ubuntu/maverick/dependencies/libr/debian/patches/005-fix-arm-mangled-section.diff
Unescape View File

@ -1,44 +0,0 @@
Index: libr-0.6.0/src/libr-bfd.c
===================================================================
--- libr-0.6.0.orig/src/libr-bfd.c 2011-03-02 22:06:52.000000000 +0000
+++ libr-0.6.0/src/libr-bfd.c 2014-03-30 10:57:27.132041406 +0000
@@ -159,7 +159,18 @@
continue; /* Section has been marked for deletion */
}
/* Use SEC_LINKER_CREATED to ask the libbfd backend to take care of configuring the section */
- oscn = bfd_make_section_anyway_with_flags(ohandle, iscn->name, iscn->flags | SEC_LINKER_CREATED);
+
+ // Keep the ARM_ATTRIBUTES section type intact on armhf systems
+ // If this is not done, readelf -A will not print any architecture information for the modified library,
+ // and ldd will report that the library cannot be found
+ if (strcmp(iscn->name, ".ARM.attributes") == 0)
+ {
+ oscn = bfd_make_section_anyway_with_flags(ohandle, iscn->name, iscn->flags);
+ }
+ else
+ {
+ oscn = bfd_make_section_anyway_with_flags(ohandle, iscn->name, iscn->flags | SEC_LINKER_CREATED);
+ }
if(oscn == NULL)
{
printf("failed to create out section: %s\n", bfd_errmsg(bfd_get_error()));
@@ -262,6 +273,7 @@
reloc_count = bfd_canonicalize_reloc(ihandle, iscn, reloc_buffer, symtab_buffer);
bfd_set_reloc(ohandle, oscn, reloc_buffer, reloc_count);
}
+
if(bfd_get_section_flags(ihandle, iscn) & SEC_HAS_CONTENTS)
{
/* NOTE: if the section is just being copied then do that, otherwise grab
@@ -286,6 +298,11 @@
return false;
}
free(buffer);
+ if(!bfd_copy_private_section_data(ihandle, iscn, ohandle, oscn))
+ {
+ printf("failed to copy private section data: %s\n", bfd_errmsg(bfd_get_error()));
+ return false;
+ }
}
}
if(!bfd_copy_private_bfd_data(ihandle, ohandle))

6
ubuntu/maverick/dependencies/libr/debian/patches/series
Unescape View File

@ -1,6 +0,0 @@
000-fix-stack-smashing.diff
001-fix-arm-builds.diff
002-fix-crash-on-malformed-icon.diff
003-fix-gtk-includes.diff
004-fix-force-arch.diff
005-fix-arm-mangled-section.diff

39
ubuntu/maverick/dependencies/libr/debian/postinst.ex
Unescape View File

@ -1,39 +0,0 @@
#!/bin/sh
# postinst script for libr
#
# see: dh_installdeb(1)
set -e
# summary of how this script can be called:
# * <postinst> `configure' <most-recently-configured-version>
# * <old-postinst> `abort-upgrade' <new version>
# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
# <new-version>
# * <postinst> `abort-remove'
# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
# <failed-install-package> <version> `removing'
# <conflicting-package> <version>
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
case "$1" in
configure)
;;
abort-upgrade|abort-remove|abort-deconfigure)
;;
*)
echo "postinst called with unknown argument \`$1'" >&2
exit 1
;;
esac
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
#DEBHELPER#
exit 0

37
ubuntu/maverick/dependencies/libr/debian/postrm.ex
Unescape View File

@ -1,37 +0,0 @@
#!/bin/sh
# postrm script for libr
#
# see: dh_installdeb(1)
set -e
# summary of how this script can be called:
# * <postrm> `remove'
# * <postrm> `purge'
# * <old-postrm> `upgrade' <new-version>
# * <new-postrm> `failed-upgrade' <old-version>
# * <new-postrm> `abort-install'
# * <new-postrm> `abort-install' <old-version>
# * <new-postrm> `abort-upgrade' <old-version>
# * <disappearer's-postrm> `disappear' <overwriter>
# <overwriter-version>
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
case "$1" in
purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
;;
*)
echo "postrm called with unknown argument \`$1'" >&2
exit 1
;;
esac
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
#DEBHELPER#
exit 0

35
ubuntu/maverick/dependencies/libr/debian/preinst.ex
Unescape View File

@ -1,35 +0,0 @@
#!/bin/sh
# preinst script for libr
#
# see: dh_installdeb(1)
set -e
# summary of how this script can be called:
# * <new-preinst> `install'
# * <new-preinst> `install' <old-version>
# * <new-preinst> `upgrade' <old-version>
# * <old-preinst> `abort-upgrade' <new-version>
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
case "$1" in
install|upgrade)
;;
abort-upgrade)
;;
*)
echo "preinst called with unknown argument \`$1'" >&2
exit 1
;;
esac
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
#DEBHELPER#
exit 0

38
ubuntu/maverick/dependencies/libr/debian/prerm.ex
Unescape View File

@ -1,38 +0,0 @@
#!/bin/sh
# prerm script for libr
#
# see: dh_installdeb(1)
set -e
# summary of how this script can be called:
# * <prerm> `remove'
# * <old-prerm> `upgrade' <new-version>
# * <new-prerm> `failed-upgrade' <old-version>
# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
# * <deconfigured's-prerm> `deconfigure' `in-favour'
# <package-being-installed> <version> `removing'
# <conflicting-package> <version>
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
case "$1" in
remove|upgrade|deconfigure)
;;
failed-upgrade)
;;
*)
echo "prerm called with unknown argument \`$1'" >&2
exit 1
;;
esac
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
#DEBHELPER#
exit 0

4
ubuntu/maverick/dependencies/libr/debian/rules
Unescape View File

@ -41,6 +41,10 @@ endif
ifneq "$(wildcard /usr/share/misc/config.guess)" "" ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess config.guess cp -f /usr/share/misc/config.guess config.guess
endif endif
cp -Rp /usr/share/aclocal/libtool.m4 libtool.m4.in
cp -Rp /usr/share/libtool/config/ltmain.sh ltmain.sh
autoconf
automake
./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" ./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"

23
ubuntu/maverick/dependencies/libr/debian/watch.ex
Unescape View File

@ -1,23 +0,0 @@
# Example watch control file for uscan
# Rename this file to "watch" and then you can run the "uscan" command
# to check for upstream updates and more.
# See uscan(1) for format
# Compulsory line, this is a version 3 file
version=3
# Uncomment to examine a Webpage
# <Webpage URL> <string match>
#http://www.example.com/downloads.php libr-(.*)\.tar\.gz
# Uncomment to examine a Webserver directory
#http://www.example.com/pub/libr-(.*)\.tar\.gz
# Uncommment to examine a FTP server
#ftp://ftp.example.com/pub/libr-(.*)\.tar\.gz debian uupdate
# Uncomment to find new files on sourceforge, for devscripts >= 2.9
# http://sf.net/libr/libr-(.*)\.tar\.gz
# Uncomment to find new files on GooglePages
# http://example.googlepages.com/foo.html libr-(.*)\.tar\.gz
Write Preview
Loading…
Cancel
Save