Skip to content
This repository was archived by the owner on Jan 31, 2019. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion recipes/autoconf/autoconf.inc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ RECIPE_TYPES = "machine native sdk"
DEPENDS = "native:m4 native:perl"

require conf/fetch/gnu.conf
SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.bz2"
SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.gz"

inherit autotools

Expand Down Expand Up @@ -48,3 +48,6 @@ FILES_${PN} += "${datadir}/autoconf"

PACKAGES += "${PN}-emacs"
FILES_${PN}-emacs += "${datadir}/emacs"

PACKAGES += "${PN}-xemacs"
FILES_${PN}-xemacs += "${datadir}/xemacs"
1 change: 0 additions & 1 deletion recipes/autoconf/autoconf_2.68.oe.sig

This file was deleted.

2 changes: 2 additions & 0 deletions recipes/autoconf/autoconf_2.69.oe.sig
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
da39a3ee5e6b4b0d3255bfef95601890afd80709 autoconf-2.69.tar.bz2
562471cbcb0dd0fa42a76665acf0dbb68479b78a autoconf-2.69.tar.gz
56 changes: 56 additions & 0 deletions recipes/automake/automake-1.14.1/runtime.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
diff -urN a/bin/aclocal.in b/bin/aclocal.in
--- a/bin/aclocal.in 2013-11-03 01:48:13.000000000 +0100
+++ b/bin/aclocal.in 2014-11-05 12:06:16.000000000 +0100
@@ -25,9 +25,11 @@
# Written by Tom Tromey <tromey@redhat.com>, and
# Alexandre Duret-Lutz <adl@gnu.org>.

+my $aclocalprefix;
BEGIN
{
- @Aclocal::perl_libdirs = ('@datadir@/@PACKAGE@-@APIVERSION@')
+ $aclocalprefix = $ENV{'aclocalprefix'} || '';
+ @Aclocal::perl_libdirs = ($aclocalprefix . '@datadir@/@PACKAGE@-@APIVERSION@')
unless @Aclocal::perl_libdirs;
unshift @INC, @Aclocal::perl_libdirs;
}
@@ -69,8 +71,8 @@
# ACLOCAL_PATH environment variable, and reset with the '--system-acdir'
# option.
my @user_includes = ();
-my @automake_includes = ("@datadir@/aclocal-$APIVERSION");
-my @system_includes = ('@datadir@/aclocal');
+my @automake_includes = ($aclocalprefix . "@datadir@/aclocal-$APIVERSION");
+my @system_includes = ($aclocalprefix . '@datadir@/aclocal');

# Whether we should copy M4 file in $user_includes[0].
my $install = 0;
diff -urN a/bin/automake.in b/bin/automake.in
--- a/bin/automake.in 2013-11-03 01:48:13.000000000 +0100
+++ b/bin/automake.in 2014-11-05 13:18:32.000000000 +0100
@@ -29,9 +29,11 @@

use strict;

+my $aclocalprefix;
BEGIN
{
- @Automake::perl_libdirs = ('@datadir@/@PACKAGE@-@APIVERSION@')
+ $aclocalprefix = $ENV{'aclocalprefix'} || '';
+ @Automake::perl_libdirs = ($aclocalprefix . '@datadir@/@PACKAGE@-@APIVERSION@')
unless @Automake::perl_libdirs;
unshift @INC, @Automake::perl_libdirs;

diff -urN a/lib/Automake/Config.in b/lib/Automake/Config.in
--- a/lib/Automake/Config.in 2013-07-22 00:25:26.000000000 +0200
+++ b/lib/Automake/Config.in 2014-11-05 13:19:11.000000000 +0100
@@ -32,7 +32,8 @@
our $PACKAGE_BUGREPORT = '@PACKAGE_BUGREPORT@';
our $VERSION = '@VERSION@';
our $RELEASE_YEAR = '@RELEASE_YEAR@';
-our $libdir = '@datadir@/@PACKAGE@-@APIVERSION@';
+my $aclocalprefix = $ENV{'aclocalprefix'} || '';
+our $libdir = $aclocalprefix . '@datadir@/@PACKAGE@-@APIVERSION@';

our $perl_threads = 0;
# We need at least this version for CLONE support.
11 changes: 10 additions & 1 deletion recipes/automake/automake.inc
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,18 @@ DESCRIPTION = "Automake is a tool for automatically generating Makefile.in \
LICENSE = "GPLv2"
HOMEPAGE = "http://www.gnu.org/software/automake/"

RECIPE_TYPES = "machine sdk native"

require conf/fetch/gnu.conf
SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.gz "

inherit autotools
inherit autotools automate

RDEPENDS_${PN} += "autoconf"

do_install () {
oe_runmake 'DESTDIR=${D}' install
install -d ${D}${datadir}
}

FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*"
12 changes: 0 additions & 12 deletions recipes/automake/automake_1.11.3.oe

This file was deleted.

1 change: 0 additions & 1 deletion recipes/automake/automake_1.11.3.oe.sig

This file was deleted.

3 changes: 3 additions & 0 deletions recipes/automake/automake_1.14.1.oe
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
require automake.inc

SRC_URI += "file://runtime.patch"
1 change: 1 addition & 0 deletions recipes/automake/automake_1.14.1.oe.sig
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0bb1714b78d70cab9907d2013082978a28f48a46 automake-1.14.1.tar.gz
27 changes: 27 additions & 0 deletions recipes/bison/bison-3.0.4/m4.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
diff -urN a/data/c-skel.m4 b/data/c-skel.m4
--- a/data/c-skel.m4 2015-01-16 15:47:42.000000000 +0100
+++ b/data/c-skel.m4 2015-05-19 11:17:37.369846890 +0200
@@ -23,4 +23,4 @@
m4_define_default([b4_used_skeleton], [b4_pkgdatadir/[yacc.c]])
m4_define_default([b4_skeleton], ["b4_basename(b4_used_skeleton)"])

-m4_include(b4_used_skeleton)
+m4_include(b4_pkgdatadir/[yacc.c])
diff -urN a/data/c++-skel.m4 b/data/c++-skel.m4
--- a/data/c++-skel.m4 2015-01-16 15:47:42.000000000 +0100
+++ b/data/c++-skel.m4 2015-05-19 11:17:48.281995788 +0200
@@ -23,4 +23,4 @@
m4_define_default([b4_used_skeleton], [b4_pkgdatadir/[lalr1.cc]])
m4_define_default([b4_skeleton], ["b4_basename(b4_used_skeleton)"])

-m4_include(b4_used_skeleton)
+m4_include(b4_pkgdatadir/[lalr1.cc])
diff -urN a/data/java-skel.m4 b/data/java-skel.m4
--- a/data/java-skel.m4 2015-01-16 15:47:42.000000000 +0100
+++ b/data/java-skel.m4 2015-05-19 11:17:19.145598194 +0200
@@ -23,4 +23,4 @@
m4_define_default([b4_used_skeleton], [b4_pkgdatadir/[lalr1.java]])
m4_define_default([b4_skeleton], ["b4_basename(b4_used_skeleton)"])

-m4_include(b4_used_skeleton)
+m4_include(b4_pkgdatadir/[lalr1.java])
14 changes: 14 additions & 0 deletions recipes/bison/bison.inc
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# -*- mode:python; -*-
RECIPE_TYPES = "machine native"

inherit autotools-autoreconf gettext wrapper

DEPENDS += "native:help2man"

require conf/fetch/gnu.conf
SRC_URI += "${GNU_MIRROR}/${PN}/${PN}-${PV}.tar.xz"
SRC_URI += "file://bin/bison;subdir=bin/"

DEPENDS_${PN} += "libintl"
RDEPENDS_${PN} += "libintl"

3 changes: 3 additions & 0 deletions recipes/bison/bison/bin/bison
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/sh
export BISON_PKGDATADIR=${datadir}/bison
exec -a ${exec_prefix}${currentfile} ${exec_prefix}${realfile} $@
3 changes: 3 additions & 0 deletions recipes/bison/bison_3.0.4.oe
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
require ${PN}.inc

SRC_URI += "file://m4.patch"
1 change: 1 addition & 0 deletions recipes/bison/bison_3.0.4.oe.sig
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8270497aad88c7dd4f2c317298c50513fb0c3c8e bison-3.0.4.tar.xz
2 changes: 1 addition & 1 deletion recipes/busybox/busybox.inc
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export EXTRA_LDFLAGS = "${LDFLAGS}"

require busybox-configure.inc

EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}"
EXTRA_OEMAKE += "ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}"
EXTRA_OEMAKE += "CROSS=${HOST_PREFIX}"

do_compile() {
Expand Down
17 changes: 17 additions & 0 deletions recipes/flex/flex-2.5.39/do_not_create_pdf_doc.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
Upstream-Status: Inapropriate (embedded specific)

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>

Index: flex-2.5.37/doc/Makefile.am
===================================================================
--- flex-2.5.37.orig/doc/Makefile.am 2012-07-21 04:18:27.000000000 +0300
+++ flex-2.5.37/doc/Makefile.am 2013-07-30 17:57:09.834834531 +0300
@@ -2,7 +2,7 @@

info_TEXINFOS = flex.texi
dist_man_MANS = flex.1
-dist_doc_DATA= flex.pdf
+EXTRA_DIST= flex.pdf

CLEANFILES = \
flex.hks \
12 changes: 12 additions & 0 deletions recipes/flex/flex.inc
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# -*- mode:python; -*-
RECIPE_TYPES = "machine native"

inherit autotools-autoreconf gettext

DEPENDS += "native:texinfo"

require conf/fetch/sourceforge.conf
SRC_URI += "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.xz"

DEPENDS_${PN} += "libintl"
RDEPENDS_${PN} += "libintl"
3 changes: 3 additions & 0 deletions recipes/flex/flex_2.5.39.oe
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
require ${PN}.inc

SRC_URI += "file://do_not_create_pdf_doc.patch"
1 change: 1 addition & 0 deletions recipes/flex/flex_2.5.39.oe.sig
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
415e82bb0dc9b1713fc4802a9db2274cd8d2909a flex-2.5.39.tar.xz
2 changes: 1 addition & 1 deletion recipes/gconf/gconf_3.2.6.oe
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ inherit autotools pkgconfig gettext

DEPENDS = "libxml2 libm libdbus-1 libdbus-glib-1 \
libgobject libglib libgthread libgmodule libgio \
native:glib-utils"
native:glib-utils native:intltool"

S = "${SRCDIR}/GConf-${PV}"

Expand Down
12 changes: 0 additions & 12 deletions recipes/gettext/gettext-0.18.1.1/ac-fix.patch

This file was deleted.

This file was deleted.

8 changes: 5 additions & 3 deletions recipes/gettext/gettext.inc
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html"

RECIPE_TYPES = "machine native sdk"

inherit c++ autotools library make-vpath
DEPENDS_AUTORECONF = ""
DEPENDS_AUTORECONF = "native:automake"
inherit c++ autotools-autoreconf library make-vpath

require conf/fetch/gnu.conf
SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz"
Expand Down Expand Up @@ -66,7 +66,7 @@ EXTRA_OECONF_GETTEXT:native = "--disable-curses --with-included-gettext"
EXTRA_OECONF_GETTEXT:HOST_OS_mingw32 = "--disable-curses --with-included-gettext"

FILES_${PN} += "${libdir}/gettext ${datadir}/gettext"
COMMON_DEPENDS = "libintl libgettextpo libgettextlib \
COMMON_DEPENDS = "libintl libgettextpo libgettextlib libgettextsrc \
libiconv ${DEPENDS_LIBNCURSES} ${DEPENDS_LIBDL} libm"
DEPENDS_${PN} = "${COMMON_DEPENDS}"
RDEPENDS_${PN} = "${COMMON_DEPENDS}"
Expand All @@ -76,6 +76,8 @@ AUTO_PACKAGE_UTILS = "autopoint envsubst gettext gettextize gettext.sh \
msgattrib msgcat msgcmp msgcomm msgconv msgen msgexec msgfilter \
msgfmt msggrep msginit msgmerge msgunfmt msguniq ngettext \
recode-sr-latin xgettext"
AUTO_PACKAGE_UTILS_RDEPENDS += "${COMMON_DEPENDS}"
AUTO_PACKAGE_UTILS_DEPENDS += "${COMMON_DEPENDS}"
DEPENDS_${PN}-gettext-sh = "${PN}-gettext ${PN}-ngettext"
RDEPENDS_${PN}-gettext-sh = "${PN}-gettext ${PN}-ngettext"
PACKAGES =+ "${PN}-utils"
Expand Down
1 change: 0 additions & 1 deletion recipes/gettext/gettext_0.18.1.1.oe.sig

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ LICENSE = "GPL-3.0+ & LGPL-2.1+"

require gettext.inc

SRC_URI += "file://ac-fix.patch"
SRC_URI += "file://gettext-0.18-gettextpo-woe32-memchr.patch"
SRC_URI += "file://gettext0.18.1.1-9ubuntu1-glibc-2.16-fix.patch"
SRC_URI:>HOST_KERNEL_darwin = " file://osx.patch"

SRC_URI:>HOST_LIBC_mingw = " file://libtool-bindir.patch"
Expand Down
1 change: 1 addition & 0 deletions recipes/gettext/gettext_0.19.4.oe.sig
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c473f4f268501d971b913197fb07767e628644bb gettext-0.19.4.tar.gz
35 changes: 35 additions & 0 deletions recipes/glib/glib-2.44.0/redifinition.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
From 4a292721bcf2943bfc05c6a1c859992f28e3efec Mon Sep 17 00:00:00 2001
From: Ryan Lortie <desrt@desrt.ca>
Date: Wed, 25 Mar 2015 09:29:49 -0400
Subject: GListModel: roll back use of type redefinition

We declare the typedefs for GListModel and GListStore in giotypes.h, as
a matter of convention. This is not actually required, since the
typedef is emitted as part of the G_DECLARE_* macros.

The giotypes.h approach is only used to avoid cyclic dependencies
between headers, which is not a problem in this case.

Type redefinition is a C11 feature, and although it was around in some
compilers before then, gcc 4.2.1 (from 2007) is apparently still in wide
use, being the default compiler for OpenBSD.

Eventually, we will probably hit a case where we actually need to
redefine a type, but since we're not there yet, let's back off a bit.

diff --git a/gio/giotypes.h b/gio/giotypes.h
index 4342d47..53f8cc9 100644
--- a/gio/giotypes.h
+++ b/gio/giotypes.h
@@ -61,8 +61,6 @@ typedef struct _GPermission GPermission;

typedef struct _GMenuModel GMenuModel;
typedef struct _GNotification GNotification;
-typedef struct _GListModel GListModel;
-typedef struct _GListStore GListStore;

/**
* GDrive:
--
cgit v0.10.2

Loading