Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 316227 Details for
Bug 423443
=games-emulation/lxdream-0.9.1-r2 fails to build with dev-libs/glib-2.32
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
lxdream-0.9.1-r2-glib-2.32.patch
lxdream-0.9.1-r2-glib-2.32.patch (text/plain), 9.33 KB, created by
Sergei Trofimovich (RETIRED)
on 2012-06-25 08:25:39 UTC
(
hide
)
Description:
lxdream-0.9.1-r2-glib-2.32.patch
Filename:
MIME Type:
Creator:
Sergei Trofimovich (RETIRED)
Created:
2012-06-25 08:25:39 UTC
Size:
9.33 KB
patch
obsolete
>Fix build failure against glib-2.32 > >In file included from tools/gendec.c:26:0: >/usr/include/glib-2.0/glib/gstrfuncs.h:28:2: error: #error "Only <glib.h> can be included directly." > >Fixed with the following script (gives duplicate headers): > for f in `cat files`; do sed -i "$f" -e 's,#include <glib/.*>,#include <glib.h>,g'; done > >diff --git a/src/aica/audio.c b/src/aica/audio.c >index 9465a3f..809ae8e 100644 >--- a/src/aica/audio.c >+++ b/src/aica/audio.c >@@ -19,7 +19,7 @@ > > #include "aica/aica.h" > #include "aica/audio.h" >-#include <glib/gmem.h> >+#include <glib.h> > #include "dream.h" > #include <assert.h> > #include <string.h> >diff --git a/src/aica/audio.h b/src/aica/audio.h >index 368684f..7c4a5a8 100644 >--- a/src/aica/audio.h >+++ b/src/aica/audio.h >@@ -20,7 +20,7 @@ > > #include <stdint.h> > #include <stdio.h> >-#include <glib/gtypes.h> >+#include <glib.h> > #include "gettext.h" > #include "plugin.h" > >diff --git a/src/cocoaui/cocoa_ctrl.m b/src/cocoaui/cocoa_ctrl.m >index 9e2c3ca..f7e665c 100644 >--- a/src/cocoaui/cocoa_ctrl.m >+++ b/src/cocoaui/cocoa_ctrl.m >@@ -23,7 +23,7 @@ > #include "maple/maple.h" > #include "vmu/vmulist.h" > >-#include <glib/gstrfuncs.h> >+#include <glib.h> > > #define FIRST_SECONDARY_DEVICE MAPLE_PORTS > >diff --git a/src/cocoaui/paths_osx.m b/src/cocoaui/paths_osx.m >index eb2d03d..ae8e403 100644 >--- a/src/cocoaui/paths_osx.m >+++ b/src/cocoaui/paths_osx.m >@@ -19,7 +19,7 @@ > */ > > #include <string.h> >-#include <glib/gstrfuncs.h> >+#include <glib.h> > > #include "lxdream.h" > #include "lxpaths.h" >diff --git a/src/config.c b/src/config.c >index 4751f4f..8d28c27 100644 >--- a/src/config.c >+++ b/src/config.c >@@ -21,8 +21,8 @@ > #include <errno.h> > #include <stdlib.h> > #include <string.h> >-#include <glib/gmem.h> >-#include <glib/gstrfuncs.h> >+#include <glib.h> >+#include <glib.h> > #include <sys/types.h> > #include <sys/stat.h> > #include "dream.h" >diff --git a/src/config.h b/src/config.h >index 65a1bfa..79c2035 100644 >--- a/src/config.h >+++ b/src/config.h >@@ -19,8 +19,8 @@ > #ifndef lxdream_config_H > #define lxdream_config_H 1 > >-#include <glib/gtypes.h> >-#include <glib/glist.h> >+#include <glib.h> >+#include <glib.h> > #include "gettext.h" > > #ifdef __cplusplus >diff --git a/src/drivers/input_lirc.c b/src/drivers/input_lirc.c >index 8f3078b..b72ea39 100644 >--- a/src/drivers/input_lirc.c >+++ b/src/drivers/input_lirc.c >@@ -28,7 +28,7 @@ > #include <dirent.h> > #include <ctype.h> > >-#include <glib/giochannel.h> >+#include <glib.h> > #include <glib.h> > > #include <lirc/lirc_client.h> >diff --git a/src/drivers/joy_linux.c b/src/drivers/joy_linux.c >index 0bd7ba4..244461e 100644 >--- a/src/drivers/joy_linux.c >+++ b/src/drivers/joy_linux.c >@@ -32,7 +32,7 @@ > #include <ctype.h> > > #include <linux/joystick.h> >-#include <glib/giochannel.h> >+#include <glib.h> > #include <glib.h> > > #include "lxdream.h" >diff --git a/src/drivers/osx_iokit.m b/src/drivers/osx_iokit.m >index b579c2f..5d80b34 100644 >--- a/src/drivers/osx_iokit.m >+++ b/src/drivers/osx_iokit.m >@@ -19,8 +19,8 @@ > * GNU General Public License for more details. > */ > >-#include <glib/gmem.h> >-#include <glib/gstrfuncs.h> >+#include <glib.h> >+#include <glib.h> > #include <sys/param.h> > #include <paths.h> > #include <string.h> >diff --git a/src/gdlist.c b/src/gdlist.c >index 13d59a5..c0f5adb 100644 >--- a/src/gdlist.c >+++ b/src/gdlist.c >@@ -19,7 +19,7 @@ > > #include <string.h> > #include <stdlib.h> >-#include <glib/gstrfuncs.h> >+#include <glib.h> > #include <libgen.h> > #include "gettext.h" > #include "gdrom/gdrom.h" >diff --git a/src/gdrom/gddriver.h b/src/gdrom/gddriver.h >index 912afc1..b003669 100644 >--- a/src/gdrom/gddriver.h >+++ b/src/gdrom/gddriver.h >@@ -24,7 +24,7 @@ > #include <stdio.h> > #include "lxdream.h" > #include "gdrom/gdrom.h" >-#include <glib/gstrfuncs.h> >+#include <glib.h> > > #ifdef __cplusplus > extern "C" { >diff --git a/src/gdrom/gdi.c b/src/gdrom/gdi.c >index d3e772a..5e9020d 100644 >--- a/src/gdrom/gdi.c >+++ b/src/gdrom/gdi.c >@@ -23,7 +23,7 @@ > #include <fcntl.h> > #include <errno.h> > #include <sys/stat.h> >-#include <glib/gutils.h> >+#include <glib.h> > #include "gdrom/gddriver.h" > > >diff --git a/src/gdrom/gdrom.c b/src/gdrom/gdrom.c >index 4393ad2..90756ed 100644 >--- a/src/gdrom/gdrom.c >+++ b/src/gdrom/gdrom.c >@@ -20,7 +20,7 @@ > #include <fcntl.h> > #include <errno.h> > #include <ctype.h> >-#include <glib/gutils.h> >+#include <glib.h> > #include "gdrom/ide.h" > #include "gdrom/gdrom.h" > #include "gdrom/gddriver.h" >diff --git a/src/gdrom/gdrom.h b/src/gdrom/gdrom.h >index 266f9c0..a93f570 100644 >--- a/src/gdrom/gdrom.h >+++ b/src/gdrom/gdrom.h >@@ -22,7 +22,7 @@ > > #include "lxdream.h" > #include "hook.h" >-#include <glib/glist.h> >+#include <glib.h> > > #ifdef __cplusplus > extern "C" { >diff --git a/src/gdrom/nrg.c b/src/gdrom/nrg.c >index 4ce9b7a..f818c71 100644 >--- a/src/gdrom/nrg.c >+++ b/src/gdrom/nrg.c >@@ -20,7 +20,7 @@ > #include <assert.h> > #include <stdio.h> > #include <errno.h> >-#include <glib/gtypes.h> >+#include <glib.h> > #include "gdrom/gddriver.h" > #include "dream.h" > >diff --git a/src/gui.h b/src/gui.h >index c124e15..c40b4f5 100644 >--- a/src/gui.h >+++ b/src/gui.h >@@ -19,7 +19,7 @@ > #ifndef lxdream_gui_H > #define lxdream_gui_H > >-#include <glib/gtypes.h> >+#include <glib.h> > > #ifdef __cplusplus > extern "C" { >diff --git a/src/loader.h b/src/loader.h >index cc26bad..6afc6a9 100644 >--- a/src/loader.h >+++ b/src/loader.h >@@ -20,7 +20,7 @@ > #define lxdream_loader_H 1 > > #include <stdio.h> >-#include <glib/gtypes.h> >+#include <glib.h> > > #ifdef __cplusplus > extern "C" { >diff --git a/src/lxdream.h b/src/lxdream.h >index 1712a89..e7eeb1a 100644 >--- a/src/lxdream.h >+++ b/src/lxdream.h >@@ -20,7 +20,7 @@ > #define lxdream_lxdream_H 1 > > #include <stdint.h> >-#include <glib/gtypes.h> >+#include <glib.h> > > #include "../config.h" > >diff --git a/src/lxpaths.c b/src/lxpaths.c >index 48fd7e7..3300e3c 100644 >--- a/src/lxpaths.c >+++ b/src/lxpaths.c >@@ -19,8 +19,8 @@ > #include <ctype.h> > #include <unistd.h> > #include <wordexp.h> >-#include <glib/gstrfuncs.h> >-#include <glib/gutils.h> >+#include <glib.h> >+#include <glib.h> > > #include "gui.h" > #include "config.h" >diff --git a/src/maple/maple.c b/src/maple/maple.c >index 64f2f05..5fb4777 100644 >--- a/src/maple/maple.c >+++ b/src/maple/maple.c >@@ -18,7 +18,7 @@ > #define MODULE maple_module > > #include <assert.h> >-#include <glib/gstrfuncs.h> >+#include <glib.h> > #include "dream.h" > #include "mem.h" > #include "asic.h" >diff --git a/src/mem.c b/src/mem.c >index 06024c4..2934894 100644 >--- a/src/mem.c >+++ b/src/mem.c >@@ -20,7 +20,7 @@ > #include <sys/types.h> > #include <sys/mman.h> > #include <sys/stat.h> >-#include <glib/gstrfuncs.h> >+#include <glib.h> > #include <assert.h> > #include <stdint.h> > #include <stdlib.h> >diff --git a/src/paths_unix.c b/src/paths_unix.c >index fda8d66..388fe6b 100644 >--- a/src/paths_unix.c >+++ b/src/paths_unix.c >@@ -18,7 +18,7 @@ > > #include <string.h> > #include <stdlib.h> >-#include <glib/gstrfuncs.h> >+#include <glib.h> > > #include "lxdream.h" > #include "config.h" >diff --git a/src/plugin.c b/src/plugin.c >index 445cb32..dc8467f 100644 >--- a/src/plugin.c >+++ b/src/plugin.c >@@ -20,8 +20,8 @@ > #include <dirent.h> > #include <dlfcn.h> > #include <string.h> >-#include <glib/gmem.h> >-#include <glib/gstrfuncs.h> >+#include <glib.h> >+#include <glib.h> > #include "plugin.h" > #include "lxpaths.h" > >diff --git a/src/pvr2/glutil.c b/src/pvr2/glutil.c >index d67cfb1..a230cbb 100644 >--- a/src/pvr2/glutil.c >+++ b/src/pvr2/glutil.c >@@ -17,7 +17,7 @@ > */ > > #include <string.h> >-#include <glib/gstrfuncs.h> >+#include <glib.h> > #include "pvr2/glutil.h" > > gboolean isGLSecondaryColorSupported() >diff --git a/src/sh4/sh4core.h b/src/sh4/sh4core.h >index 1ae72a6..a5c794a 100644 >--- a/src/sh4/sh4core.h >+++ b/src/sh4/sh4core.h >@@ -19,7 +19,7 @@ > #ifndef lxdream_sh4core_H > #define lxdream_sh4core_H 1 > >-#include <glib/gtypes.h> >+#include <glib.h> > #include <stdint.h> > #include <stdio.h> > #include "mem.h" >diff --git a/src/syscall.h b/src/syscall.h >index c26493d..0f86788 100644 >--- a/src/syscall.h >+++ b/src/syscall.h >@@ -20,7 +20,7 @@ > #define lxdream_syscall_H 1 > > #include <stdint.h> >-#include <glib/gtypes.h> >+#include <glib.h> > > #ifdef __cplusplus > extern "C" { >diff --git a/src/tools/actparse.c b/src/tools/actparse.c >index 34dc3cb..d82c297 100644 >--- a/src/tools/actparse.c >+++ b/src/tools/actparse.c >@@ -21,7 +21,7 @@ > #include <string.h> > #include <ctype.h> > #include <sys/stat.h> >-#include <glib/gstrfuncs.h> >+#include <glib.h> > #include "tools/gendec.h" > > static int add_action( struct action *actions, struct ruleset *rules, char *operation, const char *file, int line, char *action ) >diff --git a/src/tools/gendec.c b/src/tools/gendec.c >index 58f19b3..f70d2b1 100644 >--- a/src/tools/gendec.c >+++ b/src/tools/gendec.c >@@ -23,7 +23,7 @@ > #include <getopt.h> > #include <errno.h> > #include <ctype.h> >-#include <glib/gstrfuncs.h> >+#include <glib.h> > #include <assert.h> > #include "tools/gendec.h" > >diff --git a/src/vmu/vmulist.c b/src/vmu/vmulist.c >index 21caf09..5394990 100644 >--- a/src/vmu/vmulist.c >+++ b/src/vmu/vmulist.c >@@ -18,8 +18,8 @@ > > #include <string.h> > #include <stdlib.h> >-#include <glib/glist.h> >-#include <glib/gstrfuncs.h> >+#include <glib.h> >+#include <glib.h> > #include "vmulist.h" > #include "config.h" > >diff --git a/src/vmu/vmuvol.c b/src/vmu/vmuvol.c >index 15364da..5406fde 100644 >--- a/src/vmu/vmuvol.c >+++ b/src/vmu/vmuvol.c >@@ -16,8 +16,8 @@ > * GNU General Public License for more details. > */ > >-#include <glib/gmem.h> >-#include <glib/gstrfuncs.h> >+#include <glib.h> >+#include <glib.h> > #include <string.h> > #include <unistd.h> > #include <stdio.h>
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 423443
: 316227