pool/icewm
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 80147 from home:elvigia:branches:X11:windowmanagers

Browse Source 
- Must link with -lfontconfig too, fix build.

OBS-URL: https://build.opensuse.org/request/show/80147
OBS-URL: https://build.opensuse.org/package/show/X11:windowmanagers/icewm?expand=0&rev=17
This commit is contained in:
Stephan Kulow 2011-08-30 07:24:06 +00:00 committed by Git OBS Bridge
parent f0b4567c80
commit c95c1fc989
3 changed files with 59 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
icewm-linking.patch Normal file
View File

@ -0,0 +1,50 @@
--- src/Makefile.in.orig
+++ src/Makefile.in
@@ -37,9 +37,9 @@ DEFS = @DEFS@ \
CXXFLAGS = @CXXFLAGS@ $(DEBUG) $(DEFS) `pkg-config gdk-pixbuf-xlib-2.0 --cflags` \
@CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ # `fc-config --cflags`
LFLAGS = @LDFLAGS@
-LIBS = @LIBS@ `pkg-config gdk-pixbuf-xlib-2.0 --libs`
+LIBS = @LIBS@ `pkg-config gdk-pixbuf-xlib-2.0 --libs`
-CORE_LIBS = @CORE_LIBS@ # `fc-config --libs`
+CORE_LIBS = @CORE_LIBS@ `pkg-config fontconfig --libs`
IMAGE_LIBS = @IMAGE_LIBS@
AUDIO_LIBS = @AUDIO_LIBS@
GNOME1_LIBS = @GNOME1_LIBS@
@@ -207,29 +207,29 @@ clean:
%.o: %.cc
@echo " CXX " $@
- @$(CXX) $(CXXFLAGS) $(GCCDEP) -c $<
+ $(CXX) $(CXXFLAGS) $(GCCDEP) -c $<
$(BINARIES):
@echo " LD " $@
- @$(LD) -o $@ $($(@:$(EXEEXT)=)_OBJS) $(LFLAGS) $($(@:$(EXEEXT)=)_LFLAGS) $(LIBS) $($(@:$(EXEEXT)=)_LIBS)
+ $(LD) -o $@ $($(@:$(EXEEXT)=)_OBJS) $(LFLAGS) $($(@:$(EXEEXT)=)_LFLAGS) $(LIBS) $($(@:$(EXEEXT)=)_LIBS)
genpref.o: genpref.cc
@echo " HOSTCXX " $@
- @$(HOSTCXX) $(CXXFLAGS) $(GCCDEP) -c $<
+ $(HOSTCXX) $(CXXFLAGS) $(GCCDEP) -c $<
genpref$(EXEEXT):
@echo " HOSTLD " $@
- @$(HOSTLD) -o $@ $(genpref_OBJS)
+ $(HOSTLD) -o $@ $(genpref_OBJS)
################################################################################
gnome.o: gnome.cc
@echo " CXX " $@
- @$(CXX) $(CXXFLAGS) @GNOME1_CFLAGS@ $(GCCDEP) -c $<
+ $(CXX) $(CXXFLAGS) @GNOME1_CFLAGS@ $(GCCDEP) -c $<
gnome2.o: gnome2.cc
@echo " CXX " $@
- @$(CXX) $(CXXFLAGS) @GNOME2_CFLAGS@ $(GCCDEP) -c $<
+ $(CXX) $(CXXFLAGS) @GNOME2_CFLAGS@ $(GCCDEP) -c $<
################################################################################

5
icewm.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Aug 29 21:52:18 UTC 2011 - crrodriguez@opensuse.org
- Must link with -lfontconfig too, fix build.
-------------------------------------------------------------------
Tue Apr 26 11:02:56 UTC 2011 - mmarek@novell.com

7
icewm.spec
View File

@ -42,6 +42,7 @@ Patch4: icewm-1.2.35-override-config.patch
Patch5: icewm-1.2.35-empty-winmenu.patch
Patch6: icewm-1.2.35-unaligned-access.patch
Patch7: icewm-1.3.6-winoptions.patch
Patch8: icewm-linking.patch
# applied in %%build
Patch99: icewm-preferences.patch
Url: http://www.icewm.org/
@ -111,7 +112,7 @@ Authors:
%patch5
%patch6
%patch7 -p1
%patch8
%build
%{?suse_update_config:%{suse_update_config -f}}
autoconf
@ -119,7 +120,7 @@ export CFLAGS="$RPM_OPT_FLAGS"
export CXXFLAGS="$RPM_OPT_FLAGS"
# needed for 10.[12] builds in the bs
export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/gnome/%_lib/pkgconfig
./configure --without-debug \
./configure --disable-silent-rules --without-debug \
--sysconfdir=/etc \
--with-cfgdir=/etc/icewm \
--prefix=/usr \
@ -134,7 +135,7 @@ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/gnome/%_lib/pkgconfig
--with-icesound=oss,esd \
--with-imlib \
--enable-menus-gnome2
make %{?jobs:-j%jobs}
make %{?jobs:-j%jobs} V=1
# patch generated lib/preferences file
patch -p0 -i %{P:99}