pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/misc/kdeutils3 Update to KDE 3.1.5.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/518560561cde
branches:  trunk
changeset: 466318:518560561cde
user:      markd <markd%pkgsrc.org@localhost>
date:      Thu Jan 15 11:12:40 2004 +0000

description:
Update to KDE 3.1.5.

Changes:
* kdf: Fixed mem leak
* khexedit: Fixed 64 bit float big endian decoding
* khexedit: Honour ignore case setting in find next (F3)
* khexedit: Fix crash on systems which need strict alignments for double
  variables (HP-UX)

diffstat:

 misc/kdeutils3/Makefile         |    5 +-
 misc/kdeutils3/distinfo         |   14 +-
 misc/kdeutils3/patches/patch-ab |   63 ++++++----
 misc/kdeutils3/patches/patch-af |   73 +++++++-----
 misc/kdeutils3/patches/patch-ak |  226 +++++++++++++++++++++------------------
 misc/kdeutils3/patches/patch-ao |    8 +-
 6 files changed, 215 insertions(+), 174 deletions(-)

diffs (truncated from 732 to 300 lines):

diff -r b0a2fc3eb5c5 -r 518560561cde misc/kdeutils3/Makefile
--- a/misc/kdeutils3/Makefile   Thu Jan 15 11:08:18 2004 +0000
+++ b/misc/kdeutils3/Makefile   Thu Jan 15 11:12:40 2004 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2004/01/12 09:46:04 cjep Exp $
+# $NetBSD: Makefile,v 1.29 2004/01/15 11:12:40 markd Exp $
 
-DISTNAME=      kdeutils-3.1.4
+DISTNAME=      kdeutils-3.1.5
 COMMENT=       Utilities for the KDE integrated X11 desktop
-PKGREVISION=   2
 
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
diff -r b0a2fc3eb5c5 -r 518560561cde misc/kdeutils3/distinfo
--- a/misc/kdeutils3/distinfo   Thu Jan 15 11:08:18 2004 +0000
+++ b/misc/kdeutils3/distinfo   Thu Jan 15 11:12:40 2004 +0000
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.17 2003/12/27 14:35:16 mrg Exp $
+$NetBSD: distinfo,v 1.18 2004/01/15 11:12:40 markd Exp $
 
-SHA1 (kdeutils-3.1.4.tar.bz2) = 0658f1a744490fb456928b2ae41fd9be678cf509
-Size (kdeutils-3.1.4.tar.bz2) = 1382821 bytes
+SHA1 (kdeutils-3.1.5.tar.bz2) = 7f4e4994b5da6c9658151a292df641e7ff029316
+Size (kdeutils-3.1.5.tar.bz2) = 1379702 bytes
 SHA1 (patch-aa) = 1f5c49e6bea164de6fa1f6db2340d3d96f79a4d9
-SHA1 (patch-ab) = a06c6dfaf16a6c124311de61f5d1df96b22895db
+SHA1 (patch-ab) = 138e5b88d9f214b6a79adb2d09a2ef68d2eed699
 SHA1 (patch-ac) = a679be9fd652ca2df67f136ace4ad6cee43fffbd
 SHA1 (patch-ae) = 481cb84d321ab9d6cbe8c1723319f0899969cb82
-SHA1 (patch-af) = 95753640a0b56790749393e0797cd99818cdfe14
+SHA1 (patch-af) = e367d9098321324391e0c36e64b21ebf71a623af
 SHA1 (patch-ag) = 28d4e0e634f886df60212b4f54fc870217f5dbe6
 SHA1 (patch-ai) = a7a6505e5cf5a9411a47a65ba6ff1d8c34203095
 SHA1 (patch-aj) = d5c667c05354b24026e041e33e1a509166630830
-SHA1 (patch-ak) = a910a9440175c9772c3932fe59fead5b532b1df3
+SHA1 (patch-ak) = 62ba7cf0217ccebbf9c1458b34420a735ee78f80
 SHA1 (patch-am) = 1f9931d683654159686151206db4c628253e875e
 SHA1 (patch-an) = ecc14037fad569dc0627c980537bbfa03e4f820c
-SHA1 (patch-ao) = c68f205ab70cd6a5331c052b234c3fe7fb0ad411
+SHA1 (patch-ao) = 1357a3d4df4811e8af59e39ff755e6bf7543987a
 SHA1 (patch-ap) = 0bfa5bfeb6551791ea6311bbf1223732d3dfa482
diff -r b0a2fc3eb5c5 -r 518560561cde misc/kdeutils3/patches/patch-ab
--- a/misc/kdeutils3/patches/patch-ab   Thu Jan 15 11:08:18 2004 +0000
+++ b/misc/kdeutils3/patches/patch-ab   Thu Jan 15 11:12:40 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.6 2003/07/30 14:24:50 markd Exp $
+$NetBSD: patch-ab,v 1.7 2004/01/15 11:12:40 markd Exp $
 
---- kcalc/Makefile.in.orig     2003-07-15 22:19:24.000000000 +1200
+--- kcalc/Makefile.in.orig     2003-12-29 11:33:17.000000000 +1300
 +++ kcalc/Makefile.in
-@@ -272,22 +272,26 @@ x_includes = @x_includes@
+@@ -273,22 +273,26 @@ x_includes = @x_includes@
  x_libraries = @x_libraries@
  AM_CPPFLAGS = -D_GNU_SOURCE -D_ISOC99_SOURCE
  bin_PROGRAMS = kcalc
@@ -35,7 +35,7 @@
  kcalc_LDFLAGS = $(all_libraries) $(KDE_RPATH)
  
  pics_DATA = 
-@@ -305,37 +309,48 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -307,37 +311,48 @@ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(lib_LTLIBRARIES)
  
@@ -101,7 +101,7 @@
  @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@     @AMDEP_TRUE@    ./$(DEPDIR)/optiondialog.Plo ./$(DEPDIR)/stats.Plo
  
  #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-@@ -356,14 +371,15 @@ CXXLD = $(CXX)
+@@ -358,14 +373,15 @@ CXXLD = $(CXX)
  #>+ 2
  CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
        $(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -119,7 +119,7 @@
  
  #>- all: all-am
  #>+ 1
-@@ -410,6 +426,8 @@ clean-libLTLIBRARIES:
+@@ -412,6 +428,8 @@ clean-libLTLIBRARIES:
        done
  kcalc.la: $(kcalc_la_OBJECTS) $(kcalc_la_DEPENDENCIES) 
        $(CXXLINK) -rpath $(libdir) $(kcalc_la_LDFLAGS) $(kcalc_la_OBJECTS) $(kcalc_la_LIBADD) $(LIBS)
@@ -128,7 +128,7 @@
  binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
  install-binPROGRAMS: $(bin_PROGRAMS)
        @$(NORMAL_INSTALL)
-@@ -450,9 +468,10 @@ distclean-compile:
+@@ -452,9 +470,10 @@ distclean-compile:
        -rm -f *.tab.c
  
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dlabel.Plo@am__quote@
@@ -140,16 +140,16 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/optiondialog.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stats.Plo@am__quote@
  
-@@ -593,7 +612,7 @@ distclean-tags:
+@@ -595,7 +614,7 @@ distclean-tags:
        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
--KDE_DIST=cr32-app-kcalc.png cr48-app-kcalc.png optiondialog.h kcalc.desktop kcalclogo.xpm configure.in.in cr16-app-kcalc.png ToDo version.h 
+-KDE_DIST=configure.in.in version.h cr16-app-kcalc.png kcalc.desktop optiondialog.h ToDo cr32-app-kcalc.png kcalclogo.xpm cr48-app-kcalc.png 
 +KDE_DIST=version.h cr32-app-kcalc.png kcalclogo.xpm configure.in.in Makefile.in.rej kcalc.desktop cr48-app-kcalc.png optiondialog.h cr16-app-kcalc.png ToDo 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -736,9 +755,6 @@ uninstall-am: uninstall-kde-icons  unins
+@@ -737,19 +756,16 @@ uninstall-am: uninstall-kde-icons  unins
  
  messages:
        $(XGETTEXT) *.cpp -o $(podir)/kcalc.pot
@@ -159,39 +159,43 @@
  # 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:
-@@ -750,20 +766,20 @@ kcalc.moc: $(srcdir)/kcalc.h
- #>+ 1
- mocs: kcalc.moc
+ 
  #>+ 3
 -dlabel.moc: $(srcdir)/dlabel.h
 -      $(MOC) $(srcdir)/dlabel.h -o dlabel.moc
--
--#>+ 1
++kcalc.moc: $(srcdir)/kcalc.h
++      $(MOC) $(srcdir)/kcalc.h -o kcalc.moc
+ 
+ #>+ 1
 -mocs: dlabel.moc
--#>+ 3
++mocs: kcalc.moc
+ #>+ 3
  optiondialog.moc: $(srcdir)/optiondialog.h
        $(MOC) $(srcdir)/optiondialog.h -o optiondialog.moc
- 
+@@ -757,14 +773,14 @@ optiondialog.moc: $(srcdir)/optiondialog
  #>+ 1
  mocs: optiondialog.moc
  #>+ 3
+-kcalc.moc: $(srcdir)/kcalc.h
+-      $(MOC) $(srcdir)/kcalc.h -o kcalc.moc
 +dlabel.moc: $(srcdir)/dlabel.h
 +      $(MOC) $(srcdir)/dlabel.h -o dlabel.moc
-+
-+#>+ 1
+ 
+ #>+ 1
+-mocs: kcalc.moc
 +mocs: dlabel.moc
-+#>+ 3
+ #>+ 3
  clean-metasources:
--      -rm -f  kcalc.moc dlabel.moc optiondialog.moc
+-      -rm -f  dlabel.moc optiondialog.moc kcalc.moc
 +      -rm -f  kcalc.moc optiondialog.moc dlabel.moc
  
  #>+ 2
  docs-am:
-@@ -790,33 +806,33 @@ force-reedit:
+@@ -791,33 +807,33 @@ force-reedit:
  
  
  #>+ 11
--kcalc_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcalc.cpp $(srcdir)/kcalc_core.cpp $(srcdir)/dlabel.cpp $(srcdir)/stats.cpp $(srcdir)/optiondialog.cpp  kcalc.moc dlabel.moc optiondialog.moc
+-kcalc_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcalc.cpp $(srcdir)/kcalc_core.cpp $(srcdir)/dlabel.cpp $(srcdir)/stats.cpp $(srcdir)/optiondialog.cpp  dlabel.moc kcalc.moc optiondialog.moc
 -      @echo 'creating kcalc_la.all_cpp.cpp ...'; \
 -      rm -f kcalc_la.all_cpp.files kcalc_la.all_cpp.final; \
 -      echo "#define KDE_USE_FINAL 1" >> kcalc_la.all_cpp.final; \
@@ -234,11 +238,16 @@
  #>+ 3
  cvs-clean:
        $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -829,6 +845,6 @@ kde-rpo-clean:
+@@ -827,9 +843,9 @@ kde-rpo-clean:
+       -rm -f *.rpo
+ 
+ #>+ 7
+-kcalc.o: kcalc.moc 
+-dlabel.lo: dlabel.moc 
  optiondialog.o: optiondialog.moc 
+-optiondialog.lo: optiondialog.moc 
  kcalc.lo: kcalc.moc 
- optiondialog.lo: optiondialog.moc 
--dlabel.lo: dlabel.moc 
- kcalc.o: kcalc.moc 
++optiondialog.lo: optiondialog.moc 
++kcalc.o: kcalc.moc 
 +dlabel.lo: dlabel.moc 
  dlabel.o: dlabel.moc 
diff -r b0a2fc3eb5c5 -r 518560561cde misc/kdeutils3/patches/patch-af
--- a/misc/kdeutils3/patches/patch-af   Thu Jan 15 11:08:18 2004 +0000
+++ b/misc/kdeutils3/patches/patch-af   Thu Jan 15 11:12:40 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.5 2003/07/30 14:24:50 markd Exp $
+$NetBSD: patch-af,v 1.6 2004/01/15 11:12:40 markd Exp $
 
---- kedit/Makefile.in.orig     2003-07-15 22:19:24.000000000 +1200
+--- kedit/Makefile.in.orig     2003-12-29 11:33:17.000000000 +1300
 +++ kedit/Makefile.in
-@@ -281,16 +281,20 @@ x_libraries = @x_libraries@
+@@ -282,16 +282,20 @@ x_libraries = @x_libraries@
  INCLUDES = $(all_includes)
  
  bin_PROGRAMS = kedit
@@ -28,7 +28,7 @@
  kedit_LDFLAGS = $(all_libraries) $(KDE_RPATH)
  
  noinst_HEADERS = kedit.h ktextfiledlg.h\
-@@ -314,34 +318,44 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -316,34 +320,44 @@ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(lib_LTLIBRARIES)
  
@@ -87,7 +87,7 @@
  @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@     @AMDEP_TRUE@    ./$(DEPDIR)/ktextfiledlg.Plo ./$(DEPDIR)/mail.Plo \
  @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@     @AMDEP_TRUE@    ./$(DEPDIR)/optiondialog.Plo
  
-@@ -363,7 +377,8 @@ CXXLD = $(CXX)
+@@ -365,7 +379,8 @@ CXXLD = $(CXX)
  #>+ 2
  CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
        $(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -97,7 +97,7 @@
  DATA = $(apps_DATA) $(rc_DATA)
  
  HEADERS = $(noinst_HEADERS)
-@@ -377,7 +392,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
+@@ -379,7 +394,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
  DIST_COMMON = README $(noinst_HEADERS) ChangeLog Makefile.am \
        Makefile.in TODO
  DIST_SUBDIRS = $(SUBDIRS)
@@ -106,7 +106,7 @@
  
  #>- all: all-recursive
  #>+ 1
-@@ -424,6 +439,8 @@ clean-libLTLIBRARIES:
+@@ -426,6 +441,8 @@ clean-libLTLIBRARIES:
        done
  kedit.la: $(kedit_la_OBJECTS) $(kedit_la_DEPENDENCIES) 
        $(CXXLINK) -rpath $(libdir) $(kedit_la_LDFLAGS) $(kedit_la_OBJECTS) $(kedit_la_LIBADD) $(LIBS)
@@ -115,7 +115,7 @@
  binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
  install-binPROGRAMS: $(bin_PROGRAMS)
        @$(NORMAL_INSTALL)
-@@ -463,8 +480,9 @@ mostlyclean-compile:
+@@ -465,8 +482,9 @@ mostlyclean-compile:
  distclean-compile:
        -rm -f *.tab.c
  
@@ -126,16 +126,16 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ktextfiledlg.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mail.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/optiondialog.Plo@am__quote@
-@@ -670,7 +688,7 @@ distclean-tags:
+@@ -678,7 +696,7 @@ distclean-tags:
        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
--KDE_DIST=optionstate.h keditui.rc KEdit.desktop 
+-KDE_DIST=KEdit.desktop keditui.rc optionstate.h 
 +KDE_DIST=KEdit.desktop keditui.rc Makefile.in.rej optionstate.h 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -830,14 +848,17 @@ uninstall-info: uninstall-info-recursive
+@@ -838,19 +856,16 @@ uninstall-info: uninstall-info-recursive
  
  messages: rc.cpp
        $(XGETTEXT) rc.cpp *.cpp -o $(podir)/kedit.pot
@@ -147,36 +147,46 @@
  .NOEXPORT:
  
  #>+ 3
+-ktextfiledlg.moc: $(srcdir)/ktextfiledlg.h
+-      $(MOC) $(srcdir)/ktextfiledlg.h -o ktextfiledlg.moc
 +optiondialog.moc: $(srcdir)/optiondialog.h
 +      $(MOC) $(srcdir)/optiondialog.h -o optiondialog.moc
-+
-+#>+ 1
+ 
+ #>+ 1
+-mocs: ktextfiledlg.moc
 +mocs: optiondialog.moc
-+#>+ 3
+ #>+ 3
  mail.moc: $(srcdir)/mail.h
        $(MOC) $(srcdir)/mail.h -o mail.moc
- 
-@@ -856,14 +877,8 @@ kedit.moc: $(srcdir)/kedit.h
+@@ -858,11 +873,11 @@ mail.moc: $(srcdir)/mail.h
  #>+ 1
- mocs: kedit.moc
+ mocs: mail.moc
  #>+ 3
 -optiondialog.moc: $(srcdir)/optiondialog.h
 -      $(MOC) $(srcdir)/optiondialog.h -o optiondialog.moc
--
--#>+ 1



Home | Main Index | Thread Index | Old Index