jengelh/boinc-client
SHA256
1
0
Fork 0
forked from pool/boinc-client
Code Pull Requests Activity

Accepting request 127505 from home:coolo:branches:openSUSE:Factory

Browse Source 
- fix compilation for factory and 12.2

OBS-URL: https://build.opensuse.org/request/show/127505
OBS-URL: https://build.opensuse.org/package/show/network/boinc-client?expand=0&rev=27
This commit is contained in:
Christian Wittmer 2012-07-10 13:26:29 +00:00 committed by Git OBS Bridge
parent 1feb96f4e2
commit 7b6209673e
3 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
boinc-client.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Jul 10 12:24:13 UTC 2012 - coolo@suse.com
- fix compilation for factory and 12.2
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Jul 1 19:51:54 UTC 2012 - chris@computersalat.de Sun Jul 1 19:51:54 UTC 2012 - chris@computersalat.de

2
boinc-client.spec
View File

@ -68,6 +68,7 @@ Patch4: boinc-docbook2x.patch
Patch5: boinc-client-dynamic_buffers.patch Patch5: boinc-client-dynamic_buffers.patch
# PATCH-FIX-OPENSUSE computersalat - #error "Only <glib.h> can be included directly. # PATCH-FIX-OPENSUSE computersalat - #error "Only <glib.h> can be included directly.
Patch6: %{name}-glib_h.patch Patch6: %{name}-glib_h.patch
Patch7: fix-automake-conditional.patch
# #
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -190,6 +191,7 @@ This package contains documentation files for %{name}.
%if 0%{?suse_version} >= 1220 %if 0%{?suse_version} >= 1220
%patch6 %patch6
%endif %endif
%patch7 -p1
# Install user hints # Install user hints
%{__install} -m0644 %{S:3} README.SUSE %{__install} -m0644 %{S:3} README.SUSE

37
fix-automake-conditional.patch Normal file
View File

@ -0,0 +1,37 @@
Index: boinc_core_release_6_12_43/configure.ac
===================================================================
--- boinc_core_release_6_12_43.orig/configure.ac 2012-07-10 13:47:58.000000000 +0200
+++ boinc_core_release_6_12_43/configure.ac 2012-07-10 14:11:55.043582540 +0200
@@ -39,6 +39,7 @@ AC_PROG_CC
AC_PROG_CXX
AC_PROG_F77
AC_PROG_CPP
+AC_PROG_OBJCXX
AC_PROG_MAKE_SET
SAH_LINKS
AC_LANG_PUSH(C)
@@ -737,6 +738,8 @@ AM_CONDITIONAL(ENABLE_LIBRARIES, [test "
AM_CONDITIONAL(INSTALL_HEADERS, [test "${enable_install_headers}" = yes])
AM_CONDITIONAL(HAVE_CUDA_LIB, [test "${enable_client}" = yes -a -f ./coprocs/CUDA/posix/${boinc_platform}/libcudart.so])
+PKG_CHECK_MODULES([GTK2], [gtk+-2.0])
+
dnl ======================================================================
dnl some more vodoo required for building portable client-binary (client, clientgui)
dnl ======================================================================
Index: boinc_core_release_6_12_43/clientgui/Makefile.am
===================================================================
--- boinc_core_release_6_12_43.orig/clientgui/Makefile.am 2012-02-02 00:02:32.000000000 +0100
+++ boinc_core_release_6_12_43/clientgui/Makefile.am 2012-07-10 14:14:26.374552322 +0200
@@ -118,9 +118,8 @@ EXTRA_DIST = *.h \
../lib/error_numbers.h \
locale $(mac_headers)
-boincmgr_CPPFLAGS = $(AM_CPPFLAGS) $(WX_CPPFLAGS) $(SQLITE3_CPPFLAGS) $(LIBNOTIFY_CFLAGS) $(CLIENTGUIFLAGS) `pkg-config --cflags gtk+-2.0`
-boincmgr_CXXFLAGS = $(AM_CXXFLAGS) $(WX_CXXFLAGS) $(SQLITE3_CPPFLAGS) $(LIBNOTIFY_CFLAGS) $(CLIENTGUIFLAGS) `pkg-config --cflags gtk+-2.0`
-boincmgr_LDADD = $(LIBBOINC) $(SQLITE3_LIBS) $(LIBNOTIFY_LIBS) $(CLIENTGUILIBS) $(BOINC_EXTRA_LIBS) $(CLIENTLIBS)
+boincmgr_CPPFLAGS = $(AM_CPPFLAGS) $(WX_CPPFLAGS) $(SQLITE3_CPPFLAGS) $(LIBNOTIFY_CFLAGS) $(CLIENTGUIFLAGS) $(GTK2_CFLAGS)
+boincmgr_LDADD = $(LIBBOINC) $(SQLITE3_LIBS) $(LIBNOTIFY_LIBS) $(CLIENTGUILIBS) $(BOINC_EXTRA_LIBS) $(CLIENTLIBS) $(GTK2_LIBS)
win_config.h: $(top_srcdir)/config.h
grep '#define.*BOINC.*VERSION' $^ > $@