diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-01 17:10:49 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-01 17:10:49 -0400 |
| commit | 2e65e4834a226c570866f2e8976ed7f252b45cd1 (patch) | |
| tree | 21d625bce8d03627680214df4a6622bf8eb79dc9 /gnu/packages/patches/pinball-const-fix.patch | |
| parent | 9c68ecb24dd1660ce736cdcdea0422a73ec318a2 (diff) | |
| parent | f1a3c11407b52004e523ec5de20d326c5661681f (diff) | |
Merge remote-tracking branch 'origin/master' into staging
With resolved conflicts in:
gnu/packages/bittorrent.scm
gnu/packages/databases.scm
gnu/packages/geo.scm
gnu/packages/gnupg.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/python-xyz.scm
gnu/packages/xorg.scm
guix/build/qt-utils.scm
Diffstat (limited to 'gnu/packages/patches/pinball-const-fix.patch')
| -rw-r--r-- | gnu/packages/patches/pinball-const-fix.patch | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/gnu/packages/patches/pinball-const-fix.patch b/gnu/packages/patches/pinball-const-fix.patch deleted file mode 100644 index 6d7b75dd48..0000000000 --- a/gnu/packages/patches/pinball-const-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- pinball-0.3.1/base/Config.cpp 2009-10-13 18:33:38.000000000 +0200 -+++ pinball-0.3.1/base/Config.cpp 2009-10-13 18:37:12.000000000 +0200 -@@ -416,7 +416,7 @@ - m_sDataDir = string(EM_DATADIR) + "/"; - m_sExeDir = "./"; - if ( *( m_sDataDir.c_str() ) != '/' ) { -- char* ptr=0; -+ const char* ptr=0; - char* ptrw = 0; - //cout<<"relative to exe file"<<endl; - ptr = (strrchr(argv0,'/')); // unix /cygwin / check win32 |