Attachment 6743 Details for Bug 31762 – wxGTK3.1-gtk2.patch

[patch] wxGTK3.1-gtk2.patch

wxGTK3.1-gtk2.patch (text/plain), 2.61 KB, created by Aleksey Borisenkov on 2016-06-02 22:31:57 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Aleksey Borisenkov

Created: 2016-06-02 22:31:57 MSK

Size: 2.61 KB

patch

obsolete

>diff --git a/.gear/wxGTK3.1-gtk2.spec b/.gear/wxGTK3.1-gtk2.spec
>index 3a66892..eae8779 100644
>--- a/.gear/wxGTK3.1-gtk2.spec
>+++ b/.gear/wxGTK3.1-gtk2.spec
>@@ -68,9 +68,6 @@ Header files for wxGTK, the GTK+ port of the wxWidgets library.
> %setup
> %patch1 -p1
> %__subst "s,bakefile/presets,bakefile/presets-\$(WX_RELEASE),g" Makefile.in
>-sed 's/WX_RELEASE=.*/WX_RELEASE=%wxrelease/' -i configure
>-sed 's/WX_VERSION=.*/WX_VERSION=%wxversion/' -i configure
>-sed "s/WX_VERSION_TAG=.*/WX_VERSION_TAG=`echo WX\${lib_unicode_suffix}\${WX_LIB_FLAVOUR}_%(echo %wxrelease |sed 's/-.*//') | tr '[[a-z]]' '[[A-Z]]'`/" -i configure
> 
> rm -fR src/{expat,jpeg,tiff,zlib,png}
> 
>@@ -78,6 +75,9 @@ rm -fR src/{expat,jpeg,tiff,zlib,png}
> CONF_FLAG="--enable-shared --without-debug_flag --without-debug_info"
> 
> ./autogen.sh
>+sed 's/WX_RELEASE=.*/WX_RELEASE=%wxrelease/' -i configure
>+sed 's/WX_VERSION=.*/WX_VERSION=%wxversion/' -i configure
>+sed "s/WX_VERSION_TAG=.*/WX_VERSION_TAG=`echo WX\${lib_unicode_suffix}\${WX_LIB_FLAVOUR}_%(echo %wxrelease |sed 's/-.*//') | tr '[[a-z]]' '[[A-Z]]'`/" -i configure
> GST_CFLAGS="$(pkg-config --cflags gstreamer-0.10)"
> export LIBS="-lX11"
> DEFS="-DUNICODE=1 -DwxUSE_UNICODE=1 -DwxDEBUG_LEVEL=0"
>@@ -327,22 +327,20 @@ ln -sf ../..%_libdir/wx/config/$wx_config_filename %buildroot%_bindir/wx-config
> cp -fR include/wx/private %buildroot%_includedir/wx-%wxrelease/wx/
> cp -fR include/wx/unix/private %buildroot%_includedir/wx-%wxrelease/wx/unix/
> 
>-mv %buildroot%_includedir/wx-%wxrelease %buildroot%_includedir/wx-%wxbranch
>-
> %files -n lib%name
> %_libdir/*.so.*
> 
> %files -n lib%name-devel
>-%_libdir/wx/config/gtk2-unicode-%wxbranch
>-%dir %_libdir/wx/include/gtk2-unicode-%wxbranch
>-%_libdir/wx/include/gtk2-unicode-%wxbranch/wx
>+%_libdir/wx/config/gtk2-unicode-%wxrelease
>+%dir %_libdir/wx/include/gtk2-unicode-%wxrelease
>+%_libdir/wx/include/gtk2-unicode-%wxrelease/wx
> %doc docs/*
> %dir %_datadir/bakefile
> %_datadir/bakefile/*
> %_bindir/*
> %_libdir/wx/%wxversion/*.so
> %_datadir/aclocal/*.m4
>-%_includedir/wx-%wxbranch
>+%_includedir/wx-%wxrelease
> %_libdir/*.so
> 
> %changelog
>diff --git a/include/wx/debug.h b/include/wx/debug.h
>index 13f3cb7..26f945a 100644
>--- a/include/wx/debug.h
>+++ b/include/wx/debug.h
>@@ -39,9 +39,9 @@ class WXDLLIMPEXP_FWD_BASE wxCStrData;
> 
> // unless wxDEBUG_LEVEL is predefined (by configure or via wx/setup.h under
> // Windows), use the default
>-#if !defined(wxDEBUG_LEVEL)
>-    #define wxDEBUG_LEVEL 1
>-#endif // !defined(wxDEBUG_LEVEL)
>+//if !defined(wxDEBUG_LEVEL)
>+    //define wxDEBUG_LEVEL 1
>+//endif // !defined(wxDEBUG_LEVEL)
> 
> /*
>     __WXDEBUG__ is defined when wxDEBUG_LEVEL != 0. This is done mostly for

Actions: View | Diff

Attachments on bug 31762: 6655 | 6737 | 6743