summaryrefslogtreecommitdiff
path: root/graphics/kdegraphics3/patches/patch-ah
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/kdegraphics3/patches/patch-ah')
-rw-r--r--graphics/kdegraphics3/patches/patch-ah40
1 files changed, 19 insertions, 21 deletions
diff --git a/graphics/kdegraphics3/patches/patch-ah b/graphics/kdegraphics3/patches/patch-ah
index 82eeda015db..38a69a84aae 100644
--- a/graphics/kdegraphics3/patches/patch-ah
+++ b/graphics/kdegraphics3/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.3 2003/03/11 13:25:00 markd Exp $
+$NetBSD: patch-ah,v 1.4 2003/05/22 03:01:01 markd Exp $
---- kuickshow/src/Makefile.in.orig Fri Jan 17 08:46:53 2003
+--- kuickshow/src/Makefile.in.orig Thu May 8 00:03:04 2003
+++ kuickshow/src/Makefile.in
-@@ -260,26 +260,29 @@ x_includes = @x_includes@
+@@ -293,26 +293,29 @@ x_includes = @x_includes@
x_libraries = @x_libraries@
bin_PROGRAMS = kuickshow
@@ -39,7 +39,7 @@ $NetBSD: patch-ah,v 1.3 2003/03/11 13:25:00 markd Exp $
kuickshow_LDFLAGS = $(all_libraries) $(KDE_RPATH)
# if you "make distclean", this files get removed. If you want to remove
-@@ -295,30 +298,35 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -328,36 +331,41 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
@@ -89,9 +89,7 @@ $NetBSD: patch-ah,v 1.3 2003/03/11 13:25:00 markd Exp $
+kuickshow_OBJECTS = kuickshow_main.$(OBJEXT)
+kuickshow_DEPENDENCIES = libkuickshow_main.la
- DEFS = @DEFS@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-@@ -328,7 +336,7 @@ LIBS = @LIBS@
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/aboutwidget.Plo \
@@ -100,7 +98,7 @@ $NetBSD: patch-ah,v 1.3 2003/03/11 13:25:00 markd Exp $
#>- @AMDEP_TRUE@ ./$(DEPDIR)/filefinder.Plo \
#>- @AMDEP_TRUE@ ./$(DEPDIR)/filewidget.Plo \
#>- @AMDEP_TRUE@ ./$(DEPDIR)/generalwidget.Plo \
-@@ -337,12 +345,14 @@ am__depfiles_maybe = depfiles
+@@ -366,12 +374,14 @@ am__depfiles_maybe = depfiles
#>- @AMDEP_TRUE@ ./$(DEPDIR)/kuickconfigdlg.Plo \
#>- @AMDEP_TRUE@ ./$(DEPDIR)/kuickdata.Plo ./$(DEPDIR)/kuickio.Plo \
#>- @AMDEP_TRUE@ ./$(DEPDIR)/kuickshow.Plo \
@@ -118,7 +116,7 @@ $NetBSD: patch-ah,v 1.3 2003/03/11 13:25:00 markd Exp $
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/filefinder.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/filewidget.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/generalwidget.Plo \
-@@ -351,11 +361,13 @@ am__depfiles_maybe = depfiles
+@@ -380,11 +390,13 @@ am__depfiles_maybe = depfiles
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kuickconfigdlg.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kuickdata.Plo ./$(DEPDIR)/kuickio.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kuickshow.Plo \
@@ -133,7 +131,7 @@ $NetBSD: patch-ah,v 1.3 2003/03/11 13:25:00 markd Exp $
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/filefinder.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/filewidget.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/generalwidget.Plo \
-@@ -364,6 +376,8 @@ am__depfiles_maybe = depfiles
+@@ -393,6 +405,8 @@ am__depfiles_maybe = depfiles
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kuickconfigdlg.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kuickdata.Plo ./$(DEPDIR)/kuickio.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kuickshow.Plo \
@@ -142,10 +140,10 @@ $NetBSD: patch-ah,v 1.3 2003/03/11 13:25:00 markd Exp $
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurlwidget.Plo ./$(DEPDIR)/main.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/printing.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/slideshowwidget.Plo
-@@ -387,11 +401,12 @@ CXXLD = $(CXX)
+@@ -415,11 +429,12 @@ CXXLD = $(CXX)
+ #>+ 2
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
- CXXFLAGS = @CXXFLAGS@
-DIST_SOURCES = $(kuickshow_la_SOURCES) $(kuickshow_SOURCES)
+DIST_SOURCES = $(kuickshow_la_SOURCES) $(libkuickshow_main_la_SOURCES) \
+ $(kuickshow_SOURCES)
@@ -157,7 +155,7 @@ $NetBSD: patch-ah,v 1.3 2003/03/11 13:25:00 markd Exp $
#>- all: all-am
#>+ 1
-@@ -438,6 +453,8 @@ clean-libLTLIBRARIES:
+@@ -466,6 +481,8 @@ clean-libLTLIBRARIES:
done
kuickshow.la: $(kuickshow_la_OBJECTS) $(kuickshow_la_DEPENDENCIES)
$(CXXLINK) -rpath $(libdir) $(kuickshow_la_LDFLAGS) $(kuickshow_la_OBJECTS) $(kuickshow_la_LIBADD) $(LIBS)
@@ -166,7 +164,7 @@ $NetBSD: patch-ah,v 1.3 2003/03/11 13:25:00 markd Exp $
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -479,7 +496,6 @@ distclean-compile:
+@@ -507,7 +524,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aboutwidget.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/defaultswidget.Plo@am__quote@
@@ -174,7 +172,7 @@ $NetBSD: patch-ah,v 1.3 2003/03/11 13:25:00 markd Exp $
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filefinder.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filewidget.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/generalwidget.Plo@am__quote@
-@@ -491,6 +507,8 @@ distclean-compile:
+@@ -519,6 +535,8 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kuickdata.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kuickio.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kuickshow.Plo@am__quote@
@@ -183,16 +181,16 @@ $NetBSD: patch-ah,v 1.3 2003/03/11 13:25:00 markd Exp $
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kurlwidget.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printing.Plo@am__quote@
-@@ -583,7 +601,7 @@ distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+@@ -643,7 +661,7 @@ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=aboutwidget.h imagewindow.h imlibwidget.h kuickconfigdlg.h mainwidget.h mainwidget.cpp kuickdata.h printing.h generalwidget.h cr32-app-kuickshow.png filefinder.h defaultswidget.h imdata.h cr16-app-kuickshow.png slideshowwidget.h kuickshow.desktop kuickshow.h lo32-app-kuickshow.png kuickglobals.h filewidget.h kurlwidget.h lo16-app-kuickshow.png kuick.h kuickio.h version.h
-+KDE_DIST=slideshowwidget.h printing.h Makefile.am.rej kuickshow.h kuickshow.desktop kuickio.h cr32-app-kuickshow.png mainwidget.h cr16-app-kuickshow.png lo32-app-kuickshow.png imdata.h mainwidget.cpp imlibwidget.h kuickconfigdlg.h version.h lo16-app-kuickshow.png generalwidget.h kurlwidget.h kuickdata.h kuickglobals.h defaultswidget.h filefinder.h filewidget.h imagewindow.h kuick.h aboutwidget.h
++KDE_DIST=slideshowwidget.h printing.h kuickshow.h kuickshow.desktop kuickio.h cr32-app-kuickshow.png mainwidget.h cr16-app-kuickshow.png lo32-app-kuickshow.png imdata.h mainwidget.cpp imlibwidget.h kuickconfigdlg.h version.h lo16-app-kuickshow.png generalwidget.h kurlwidget.h kuickdata.h kuickglobals.h defaultswidget.h filefinder.h filewidget.h imagewindow.h kuick.h aboutwidget.h
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-@@ -638,7 +656,6 @@ install-strip:
+@@ -704,7 +722,6 @@ install-strip:
mostlyclean-generic:
clean-generic:
@@ -200,7 +198,7 @@ $NetBSD: patch-ah,v 1.3 2003/03/11 13:25:00 markd Exp $
distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES)
-@@ -716,72 +733,69 @@ messages:
+@@ -790,72 +807,69 @@ messages:
$(XGETTEXT) *.cpp *.h -o $(podir)/kuickshow.pot
# this is where the kdelnk file will go
@@ -300,7 +298,7 @@ $NetBSD: patch-ah,v 1.3 2003/03/11 13:25:00 markd Exp $
#>+ 2
docs-am:
-@@ -811,33 +825,33 @@ force-reedit:
+@@ -885,33 +899,33 @@ force-reedit:
#>+ 11
@@ -347,7 +345,7 @@ $NetBSD: patch-ah,v 1.3 2003/03/11 13:25:00 markd Exp $
#>+ 3
cvs-clean:
$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -847,31 +861,31 @@ kde-rpo-clean:
+@@ -921,31 +935,31 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 29