Hello community,

here is the log from the commit of package icewm for openSUSE:Factory
checked in at Tue Aug 30 10:28:25 CEST 2011.



--------
--- icewm/icewm.changes 2011-04-26 13:04:07.000000000 +0200
+++ /mounts/work_src_done/STABLE/icewm/icewm.changes    2011-08-29 
23:52:51.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Aug 29 21:52:18 UTC 2011 - [email protected]
+
+- Must link with -lfontconfig too, fix build. 
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  icewm-linking.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ icewm.spec ++++++
--- /var/tmp/diff_new_pack.aGnZ2Y/_old  2011-08-30 10:26:50.000000000 +0200
+++ /var/tmp/diff_new_pack.aGnZ2Y/_new  2011-08-30 10:26:50.000000000 +0200
@@ -32,7 +32,7 @@
 Requires:       icewm-bin, xdg-menu, desktop-data
 AutoReqProv:    on
 Version:        1.3.7
-Release:        1
+Release:        14
 Source:         icewm-%version.tar.bz2
 Source1:        %{name}.desktop
 Patch1:         icewm-multiByte.patch
@@ -42,6 +42,7 @@
 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,6 +112,7 @@
 %patch5
 %patch6
 %patch7 -p1
+%patch8
 
 %build
 %{?suse_update_config:%{suse_update_config -f}}
@@ -119,7 +121,7 @@
 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 +136,7 @@
            --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}
 

++++++ icewm-linking.patch ++++++
--- 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 $<
 
 
################################################################################
 

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to