diff options
| author | Ismael Luceno | 2022-08-08 00:04:47 +0200 |
|---|---|---|
| committer | Ismael Luceno | 2022-08-08 02:01:57 +0200 |
| commit | 7b6857ef91bff901671286b92662772e89de030a (patch) | |
| tree | f43a24cc2b8330aa0c483e5535b4036c339e5e2a /libs | |
| parent | c2710f4c20f445f7ee7880d5c26470b1c1951b23 (diff) | |
glib: Convert patches to -p1
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/glib/HISTORY | 1 | ||||
| -rwxr-xr-x | libs/glib/PRE_BUILD | 2 | ||||
| -rw-r--r-- | libs/glib/patches/config.sub.patch (renamed from libs/glib/config.sub.patch) | 4 | ||||
| -rw-r--r-- | libs/glib/patches/gcc.patch (renamed from libs/glib/gcc.diff) | 4 |
4 files changed, 5 insertions, 6 deletions
diff --git a/libs/glib/HISTORY b/libs/glib/HISTORY index ddabdeecee..fd79142deb 100644 --- a/libs/glib/HISTORY +++ b/libs/glib/HISTORY @@ -1,6 +1,7 @@ 2022-08-08 Ismael Luceno <ismael@sourcemage.org> * PRE_BUILD, patches/0001-Fix-function-inlining-with-newer-GCC.patch: Fixed glib.h header for newer GCC + * patches/config.sub.patch, patches/gcc.patch: Converted patches to -p1 2020-12-19 Ismael Luceno <ismael@sourcemage.org> * BUILD, PRE_BUILD: Moved patching to PRE_BUILD diff --git a/libs/glib/PRE_BUILD b/libs/glib/PRE_BUILD index ac250417c1..28738af9ab 100755 --- a/libs/glib/PRE_BUILD +++ b/libs/glib/PRE_BUILD @@ -1,6 +1,4 @@ default_pre_build && cd "$SOURCE_DIRECTORY" && apply_patch_dir patches && -patch -p0 < $SPELL_DIRECTORY/gcc.diff && -patch -p0 < $SPELL_DIRECTORY/config.sub.patch && sedit '/^#include "glib\.h"/a#include <poll.h>' gmain.c diff --git a/libs/glib/config.sub.patch b/libs/glib/patches/config.sub.patch index c3569a1c3f..60944953b4 100644 --- a/libs/glib/config.sub.patch +++ b/libs/glib/patches/config.sub.patch @@ -1,5 +1,5 @@ ---- config.sub.old 2000-02-02 16:53:22.000000000 -0800 -+++ config.sub 2005-04-04 23:12:05.000000000 -0700 +--- a/config.sub ++++ b/config.sub @@ -632,6 +631,9 @@ pentiumii-* | pentium2-*) basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` diff --git a/libs/glib/gcc.diff b/libs/glib/patches/gcc.patch index 26cc766b0a..825b4c6723 100644 --- a/libs/glib/gcc.diff +++ b/libs/glib/patches/gcc.patch @@ -1,5 +1,5 @@ ---- glib.h 2004-05-23 16:13:42.707743928 +0200 -+++ glib.h.cp 2004-05-23 16:15:39.960918736 +0200 +--- a/glib.h ++++ b/glib.h @@ -272,7 +272,7 @@ /* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with * macros, so we can refer to them as strings unconditionally. |