Gentoo Archives: gentoo-commits

From: "Michael Sterrett (mr_bones_)" <mr_bones_@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in games-strategy/warmux/files: warmux-11.01-gentoo.patch
Date: Sun, 23 Jan 2011 07:50:46
Message-Id: 20110123075036.9ED2520054@flycatcher.gentoo.org
1 mr_bones_ 11/01/23 07:50:36
2
3 Added: warmux-11.01-gentoo.patch
4 Log:
5 version bump
6
7 (Portage version: 2.1.9.25/cvs/Linux i686)
8
9 Revision Changes Path
10 1.1 games-strategy/warmux/files/warmux-11.01-gentoo.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/warmux/files/warmux-11.01-gentoo.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/warmux/files/warmux-11.01-gentoo.patch?rev=1.1&content-type=text/plain
14
15 Index: warmux-11.01-gentoo.patch
16 ===================================================================
17 --- warmux-11.01.orig/configure.ac
18 +++ warmux-11.01/configure.ac
19 @@ -43,8 +43,6 @@
20 AC_MSG_ERROR([*** No C++ compiler can be found!])
21 fi
22
23 -AX_CFLAGS_WARN_ALL([CXXFLAGS])
24 -
25 # ========================================================================
26 # == Set flags for various environments =
27 # ========================================================================
28 @@ -345,14 +343,7 @@
29 exit 1
30 fi
31
32 -dnl === Add Werror flag for gcc/g++ if debug mode is enabled, ==============
33 -dnl === but allow RTTI (ie dynamic_cast, typeid/typeinfo unavailable) ======
34 -if test "x${debug}" = "xyes"; then
35 - CFLAGS="$CFLAGS -Werror"
36 - CXXFLAGS="$CXXFLAGS -Werror"
37 -else
38 - CXXFLAGS="$CXXFLAGS -fno-rtti"
39 -fi
40 +CXXFLAGS="$CXXFLAGS -fno-rtti"
41
42 dnl === Forbid exceptions (Android platform requirement) ===================
43 CXXFLAGS="$CXXFLAGS -fno-exceptions"
44 --- warmux-11.01.orig/data/Makefile.am
45 +++ warmux-11.01/data/Makefile.am
46 @@ -1,8 +1,2 @@
47 -xdg_appsdir = $(prefix)/share/applications
48 -xdg_apps_DATA = warmux.desktop
49 -pixmapsdir = $(prefix)/share/pixmaps
50 -pixmaps_DATA = icon/warmux_128x128.png
51 -
52 nobase_dist_pkgdata_DATA = @DATA_FILES@
53 pkgdatadir = @DATADIR@
54 -EXTRA_DIST = $(pixmaps_DATA)
55 --- warmux-11.01.orig/src/menu/options_menu.cpp
56 +++ warmux-11.01/src/menu/options_menu.cpp
57 @@ -506,26 +506,7 @@
58
59 void OptionMenu::CheckUpdates()
60 {
61 - if (!Config::GetInstance()->GetCheckUpdates()
62 - || Constants::WARMUX_VERSION.find("svn") != std::string::npos)
63 return;
64 -
65 - Downloader *dl = Downloader::GetInstance();
66 - std::string latest_version;
67 - if (dl->GetLatestVersion(latest_version)) {
68 - const char *cur_version = Constants::GetInstance()->WARMUX_VERSION.c_str();
69 - if (latest_version != cur_version) {
70 - Question new_version;
71 - std::string txt = Format(_("A new version %s is available, while your version is %s. "
72 - "You may want to check whether an update is available for your OS!"),
73 - latest_version.c_str(), cur_version);
74 - new_version.Set(txt, true, 0);
75 - new_version.Ask();
76 - }
77 - } else {
78 - AppWarmux::DisplayError(Format(_("Version verification failed because: %s"),
79 - dl->GetLastError().c_str()));
80 - }
81 }
82
83 uint OptionMenu::toVolume(uint level)