pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics/kdegraphics3 Update to KDE 3.1.5.
details: https://anonhg.NetBSD.org/pkgsrc/rev/929dd4bc287e
branches: trunk
changeset: 466312:929dd4bc287e
user: markd <markd%pkgsrc.org@localhost>
date: Thu Jan 15 10:50:34 2004 +0000
description:
Update to KDE 3.1.5.
Changes:
* kiconedit: Fix loading of remote files
diffstat:
graphics/kdegraphics3/Makefile | 5 +-
graphics/kdegraphics3/distinfo | 10 +-
graphics/kdegraphics3/patches/patch-ad | 63 +++++-----
graphics/kdegraphics3/patches/patch-ah | 194 ++++++++++++++++----------------
4 files changed, 138 insertions(+), 134 deletions(-)
diffs (truncated from 608 to 300 lines):
diff -r d3df7a77f7a7 -r 929dd4bc287e graphics/kdegraphics3/Makefile
--- a/graphics/kdegraphics3/Makefile Thu Jan 15 10:42:58 2004 +0000
+++ b/graphics/kdegraphics3/Makefile Thu Jan 15 10:50:34 2004 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2004/01/03 18:49:43 reed Exp $
+# $NetBSD: Makefile,v 1.27 2004/01/15 10:50:34 markd Exp $
-DISTNAME= kdegraphics-3.1.4
-PKGREVISION= 1
+DISTNAME= kdegraphics-3.1.5
CATEGORIES= graphics
COMMENT= Graphics programs for the KDE integrated X11 desktop
diff -r d3df7a77f7a7 -r 929dd4bc287e graphics/kdegraphics3/distinfo
--- a/graphics/kdegraphics3/distinfo Thu Jan 15 10:42:58 2004 +0000
+++ b/graphics/kdegraphics3/distinfo Thu Jan 15 10:50:34 2004 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.13 2003/09/17 23:45:22 markd Exp $
+$NetBSD: distinfo,v 1.14 2004/01/15 10:50:34 markd Exp $
-SHA1 (kdegraphics-3.1.4.tar.bz2) = fc88b7d4cb98e7cb8e36e51c79b80146dca83857
-Size (kdegraphics-3.1.4.tar.bz2) = 4594882 bytes
+SHA1 (kdegraphics-3.1.5.tar.bz2) = f761d37bd9cc645c9e914317bc4d899e519839f1
+Size (kdegraphics-3.1.5.tar.bz2) = 4588751 bytes
SHA1 (patch-ac) = fb07e0d4b91261dc14bd53925d5a7b98dcbbb570
-SHA1 (patch-ad) = bda94c5d7987298bf6c0314b065ae638a185ea4d
+SHA1 (patch-ad) = b362bd0ec5be944aa6cfcc4161e2f71e547212bc
SHA1 (patch-af) = 854f2f4eac31afd89184871a79dc7f459f866f34
SHA1 (patch-ag) = ee685c88b0bcbd70256f49190e9b9bb4520d81e0
-SHA1 (patch-ah) = 357684649e1903eb74c1f5264896346d1ec36dc2
+SHA1 (patch-ah) = fe9ed6232ce92b8ab932218a8549ee6f6156790a
SHA1 (patch-ai) = 78e82154d831918f7ebe6d4a1d89b5cb208b57f1
diff -r d3df7a77f7a7 -r 929dd4bc287e graphics/kdegraphics3/patches/patch-ad
--- a/graphics/kdegraphics3/patches/patch-ad Thu Jan 15 10:42:58 2004 +0000
+++ b/graphics/kdegraphics3/patches/patch-ad Thu Jan 15 10:50:34 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.5 2003/07/30 14:30:16 markd Exp $
+$NetBSD: patch-ad,v 1.6 2004/01/15 10:50:34 markd Exp $
---- kview/Makefile.in.orig 2003-07-15 22:10:06.000000000 +1200
+--- kview/Makefile.in.orig 2003-12-29 11:27:02.000000000 +1300
+++ kview/Makefile.in
-@@ -299,7 +299,7 @@ INCLUDES = -I$(top_srcdir)/kview $(all_i
+@@ -300,7 +300,7 @@ INCLUDES = -I$(top_srcdir)/kview $(all_i
#>- METASOURCES = AUTO
bin_PROGRAMS = kview
@@ -11,7 +11,7 @@
noinst_HEADERS = kview.h kpreferencesdialog.h kpreferencesmodule.h kpluginselector.h kviewconfmodules.h
-@@ -307,13 +307,17 @@ libkviewsupport_la_SOURCES = kpreference
+@@ -308,13 +308,17 @@ libkviewsupport_la_SOURCES = kpreference
libkviewsupport_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 0:0
libkviewsupport_la_LIBADD = $(LIB_KDEUI)
@@ -33,7 +33,7 @@
lnkdir = $(kde_appsdir)/Graphics
lnk_DATA = kview.desktop
-@@ -328,14 +332,19 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -330,14 +334,19 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
@@ -59,7 +59,7 @@
libkviewsupport_la_DEPENDENCIES =
am_libkviewsupport_la_OBJECTS = kpreferencesdialog.lo \
kpreferencesmodule.lo kpluginselector.lo
-@@ -349,35 +358,35 @@ libkviewsupport_la_nofinal_OBJECTS = kpr
+@@ -351,35 +360,35 @@ libkviewsupport_la_nofinal_OBJECTS = kpr
bin_PROGRAMS = kview$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)
@@ -107,7 +107,7 @@
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kviewconfmodules.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo
-@@ -399,8 +408,8 @@ CXXLD = $(CXX)
+@@ -401,8 +410,8 @@ CXXLD = $(CXX)
#>+ 2
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -118,7 +118,7 @@
DATA = $(lnk_DATA) $(rc_DATA)
HEADERS = $(noinst_HEADERS)
-@@ -413,7 +422,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
+@@ -415,7 +424,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
check-recursive installcheck-recursive
DIST_COMMON = $(noinst_HEADERS) AUTHORS Makefile.am Makefile.in TODO
DIST_SUBDIRS = $(SUBDIRS)
@@ -127,7 +127,7 @@
#>- all: all-recursive
#>+ 1
-@@ -460,6 +469,8 @@ clean-libLTLIBRARIES:
+@@ -462,6 +471,8 @@ clean-libLTLIBRARIES:
done
kview.la: $(kview_la_OBJECTS) $(kview_la_DEPENDENCIES)
$(CXXLINK) -rpath $(libdir) $(kview_la_LDFLAGS) $(kview_la_OBJECTS) $(kview_la_LIBADD) $(LIBS)
@@ -136,7 +136,7 @@
#>- libkviewsupport.la: $(libkviewsupport_la_OBJECTS) $(libkviewsupport_la_DEPENDENCIES)
#>+ 2
@KDE_USE_CLOSURE_TRUE%libkviewsupport.la@localhost: libkviewsupport.la.closure $(libkviewsupport_la_OBJECTS) $(libkviewsupport_la_DEPENDENCIES)
-@@ -504,11 +515,12 @@ mostlyclean-compile:
+@@ -506,11 +517,12 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
@@ -150,16 +150,16 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kviewconfmodules.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@
-@@ -713,7 +725,7 @@ distclean-tags:
+@@ -721,7 +733,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
--KDE_DIST=kviewui.rc cr48-app-kview.png cr16-app-kview.png cr32-app-kview.png kview.desktop version.h
+-KDE_DIST=kview.desktop cr16-app-kview.png cr48-app-kview.png kviewui.rc cr32-app-kview.png version.h
+KDE_DIST=kview.desktop cr48-app-kview.png kviewui.rc version.h Makefile.in.rej cr16-app-kview.png cr32-app-kview.png
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-@@ -879,20 +891,11 @@ uninstall-info: uninstall-info-recursive
+@@ -887,9 +899,6 @@ uninstall-info: uninstall-info-recursive
messages: rc.cpp
$(EXTRACTRC) kviewviewer/*.rc kviewviewer/*.ui >> rc.cpp
$(XGETTEXT) kviewviewer/*.cpp kviewcanvas/*.cpp *.cpp *.h -o $(podir)/kview.pot
@@ -169,7 +169,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-
+@@ -901,12 +910,6 @@ kpluginselector.moc: $(srcdir)/kpluginse
+ #>+ 1
+ mocs: kpluginselector.moc
#>+ 3
-kviewconfmodules.moc: $(srcdir)/kviewconfmodules.h
- $(MOC) $(srcdir)/kviewconfmodules.h -o kviewconfmodules.moc
@@ -177,10 +179,10 @@
-#>+ 1
-mocs: kviewconfmodules.moc
-#>+ 3
- kpluginselector.moc: $(srcdir)/kpluginselector.h
- $(MOC) $(srcdir)/kpluginselector.h -o kpluginselector.moc
+ kpreferencesmodule.moc: $(srcdir)/kpreferencesmodule.h
+ $(MOC) $(srcdir)/kpreferencesmodule.h -o kpreferencesmodule.moc
-@@ -911,6 +914,12 @@ kview.moc: $(srcdir)/kview.h
+@@ -919,6 +922,12 @@ kview.moc: $(srcdir)/kview.h
#>+ 1
mocs: kview.moc
#>+ 3
@@ -193,16 +195,16 @@
kpreferencesdialog.moc: $(srcdir)/kpreferencesdialog.h
$(MOC) $(srcdir)/kpreferencesdialog.h -o kpreferencesdialog.moc
-@@ -927,7 +936,7 @@ libkviewsupport.la.closure: $(libkviewsu
+@@ -935,7 +944,7 @@ libkviewsupport.la.closure: $(libkviewsu
#>+ 3
clean-metasources:
-- -rm -f kviewconfmodules.moc kpluginselector.moc kpreferencesmodule.moc kview.moc kpreferencesdialog.moc
+- -rm -f kpluginselector.moc kviewconfmodules.moc kpreferencesmodule.moc kview.moc kpreferencesdialog.moc
+ -rm -f kpluginselector.moc kpreferencesmodule.moc kview.moc kviewconfmodules.moc kpreferencesdialog.moc
#>+ 3
clean-closures:
-@@ -958,16 +967,16 @@ force-reedit:
+@@ -966,16 +975,16 @@ force-reedit:
#>+ 11
@@ -227,7 +229,7 @@
#>+ 11
libkviewsupport_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kpreferencesdialog.cpp $(srcdir)/kpreferencesmodule.cpp $(srcdir)/kpluginselector.cpp kpluginselector.moc kpreferencesmodule.moc
kpreferencesdialog.moc
-@@ -983,20 +992,20 @@ libkviewsupport_la.all_cpp.cpp: $(srcdir
+@@ -991,20 +1000,20 @@ libkviewsupport_la.all_cpp.cpp: $(srcdir
#>+ 3
clean-final:
@@ -253,21 +255,22 @@
#>+ 3
cvs-clean:
$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -1007,12 +1016,12 @@ kde-rpo-clean:
+@@ -1014,13 +1023,13 @@ kde-rpo-clean:
+ -rm -f *.rpo
#>+ 11
- kpreferencesdialog.o: kpreferencesdialog.moc
--kview.o: kview.moc
-kview.lo: kview.moc
- kviewconfmodules.o: kviewconfmodules.moc
--kpreferencesdialog.lo: kpreferencesdialog.moc
--kviewconfmodules.lo: kviewconfmodules.moc
-+kview.o: kview.moc
++kpreferencesdialog.o: kpreferencesdialog.moc
++kviewconfmodules.o: kviewconfmodules.moc
+ kview.o: kview.moc
+kpreferencesmodule.o: kpreferencesmodule.moc
kpluginselector.lo: kpluginselector.moc
+-kpreferencesdialog.o: kpreferencesdialog.moc
kpreferencesmodule.lo: kpreferencesmodule.moc
+-kpreferencesmodule.o: kpreferencesmodule.moc
+kpreferencesdialog.lo: kpreferencesdialog.moc
-+kviewconfmodules.lo: kviewconfmodules.moc
+ kviewconfmodules.lo: kviewconfmodules.moc
kpluginselector.o: kpluginselector.moc
--kpreferencesmodule.o: kpreferencesmodule.moc
+-kviewconfmodules.o: kviewconfmodules.moc
+-kpreferencesdialog.lo: kpreferencesdialog.moc
+kview.lo: kview.moc
diff -r d3df7a77f7a7 -r 929dd4bc287e graphics/kdegraphics3/patches/patch-ah
--- a/graphics/kdegraphics3/patches/patch-ah Thu Jan 15 10:42:58 2004 +0000
+++ b/graphics/kdegraphics3/patches/patch-ah Thu Jan 15 10:50:34 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.5 2003/07/30 14:30:16 markd Exp $
+$NetBSD: patch-ah,v 1.6 2004/01/15 10:50:34 markd Exp $
---- kuickshow/src/Makefile.in.orig 2003-07-15 22:10:06.000000000 +1200
+--- kuickshow/src/Makefile.in.orig 2003-12-29 11:27:02.000000000 +1300
+++ kuickshow/src/Makefile.in
-@@ -294,26 +294,29 @@ x_includes = @x_includes@
+@@ -295,26 +295,29 @@ x_includes = @x_includes@
x_libraries = @x_libraries@
bin_PROGRAMS = kuickshow
@@ -39,7 +39,7 @@
kuickshow_LDFLAGS = $(all_libraries) $(KDE_RPATH)
# if you "make distclean", this files get removed. If you want to remove
-@@ -329,36 +332,41 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -331,36 +334,41 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
@@ -98,7 +98,7 @@
#>- @AMDEP_TRUE@ ./$(DEPDIR)/filefinder.Plo \
#>- @AMDEP_TRUE@ ./$(DEPDIR)/filewidget.Plo \
#>- @AMDEP_TRUE@ ./$(DEPDIR)/generalwidget.Plo \
-@@ -367,12 +375,14 @@ am__depfiles_maybe = depfiles
+@@ -369,12 +377,14 @@ am__depfiles_maybe = depfiles
#>- @AMDEP_TRUE@ ./$(DEPDIR)/kuickconfigdlg.Plo \
#>- @AMDEP_TRUE@ ./$(DEPDIR)/kuickdata.Plo ./$(DEPDIR)/kuickio.Plo \
#>- @AMDEP_TRUE@ ./$(DEPDIR)/kuickshow.Plo \
@@ -116,7 +116,7 @@
@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 \
-@@ -381,11 +391,13 @@ am__depfiles_maybe = depfiles
+@@ -383,11 +393,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 \
@@ -131,7 +131,7 @@
@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 \
-@@ -394,6 +406,8 @@ am__depfiles_maybe = depfiles
+@@ -396,6 +408,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 \
@@ -140,7 +140,7 @@
@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
-@@ -416,11 +430,12 @@ CXXLD = $(CXX)
+@@ -418,11 +432,12 @@ CXXLD = $(CXX)
#>+ 2
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -155,7 +155,7 @@
#>- all: all-am
#>+ 1
-@@ -467,6 +482,8 @@ clean-libLTLIBRARIES:
+@@ -469,6 +484,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)
@@ -164,7 +164,7 @@
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -508,7 +525,6 @@ distclean-compile:
+@@ -510,7 +527,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@
@@ -172,7 +172,7 @@
@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@
-@@ -520,6 +536,8 @@ distclean-compile:
+@@ -522,6 +538,8 @@ distclean-compile:
Home |
Main Index |
Thread Index |
Old Index