[Digikam-devel] Future plans : 0.9.2-final and KDE4 port...

[Achim Bohnet]

On Tuesday, 12. June 2007, Gerhard Kulzer wrote:
> Am Tuesday 12 June 2007 schrieb Angelo Naselli:
> > Alle lunedì 11 giugno 2007, Gilles Caulier ha scritto:
> > > Hi all,
> > >
> > > See below the future digiKam plans :
> > >
> > > DIGIKAM 0.9.2 FINAL RELEASE:
> > > ---------------------------------------------
> > >
> > > The 0.9.2-final release date is near. Like Gerhard will back at home
> > > today (:=))), final release will be done at soon.
> > >
> > > Gerhard, just a little tip : the libkdcraw need to be released again
> > > following #146464 B.K.O file. the library have been patched to fix this
> > > bug. So 0.9.2-final will need a new small 0.1.1 release of libkdcraw...
> > >
> > > Angelo, Achim : Please take a care to provide a new package of this
> > > library for Mandriva and Debian at the same time than digiKam 0.9.2.
> > > thanks in advance...
> >
> > hmm, the problem is that often i see that digikam has been released and
> > then i know it. Maybe in a case like this one we can talk, also in private,
> > to get the related libraries released first ;)
> >
> > Ok, if you can wait for a day more, tonight i can release new libkdcraw
> > tonight and maybe a kipi-plugins rc1(?) beta2(?), I would have liked the
> > rc1 to get final ready for the next week, but i haven't got the time to see
> > the state of bugs by now, and it depends on docs status anyway....
> >
> > Is it ok for you?
> >
> > Angelo
> 
> Can you give me a release hour for libkdcraw tomorrow? Then I can sync 0.9.2 
> final with it.

Hi Gerhard,

Angelo and me tried to get the tarball ready but did not finish.

The problems were/are:

 1) kdcraw binary needs to be installed into $prefix/lib/libkdcraw<abi-major>/kdcraw
   so libkdcraw0 and libkdraw1 can be installed in parallel  (fixed with commit:
   674731)  See also: http://www.pathname.com/fhs/pub/fhs-2.3.html#USRLIBLIBRARIESFORPROGRAMMINGANDPA

 2) libkdcraw.mo files need to be installed as libkdcraw<abi-major>.mo. Again to
   allow libkdcraw0 and libkdraw1 installations at the same time.

   @Gilles: how are the translations loaded?  There no insertCatalog like in the
   old libkexif lib.

 3) release_*.rb needs to be adpated to the new layout in svn

Angelo and me will try to finish 2) and 3) Wednesday night.  Keep your fingers
crossed.

Sorry for the delay,
Achim
> 
> Gerhard
> 
> 

Index: libkdcraw/dcraw/Makefile.am
===================================================================
--- libkdcraw/dcraw/Makefile.am (revision 674730)
+++ libkdcraw/dcraw/Makefile.am (revision 674731)
@@ -14,9 +14,11 @@
 # Note: dcraw project page is http://cybercom.net/~dcoffin

 bin_PROGRAMS = kdcraw
+bindir = $(KDCRAW_DIR)

-# The manual page of binary program.
-man_MANS = kdcraw.1
+# The manual page of binary program. (Don't install manpage of a library
+# internal helper app
+#man_MANS = kdcraw.1

 # This line is require to prevent broken compilation with -std=iso9899:1990 gcc option.
 # In fact, dcraw.c use lcms.h witch use the "inline" keyword witch do not exist in pure C
Index: libkdcraw/libkdcraw/dcrawbinary.cpp
===================================================================
--- libkdcraw/libkdcraw/dcrawbinary.cpp (revision 674730)
+++ libkdcraw/libkdcraw/dcrawbinary.cpp (revision 674731)
@@ -108,7 +108,7 @@

 const char *DcrawBinary::path()
 {
-    return "kdcraw";
+    return KDCRAW_DIR "/kdcraw";
 }

 bool DcrawBinary::isAvailable() const
Index: libkdcraw/libkdcraw/Makefile.am
===================================================================
--- libkdcraw/libkdcraw/Makefile.am     (revision 674730)
+++ libkdcraw/libkdcraw/Makefile.am     (revision 674731)
@@ -1,13 +1,12 @@
 METASOURCES = AUTO

-INCLUDES= $(all_includes)
+INCLUDES= -DKDCRAW_DIR='"$(KDCRAW_DIR)"' $(all_includes)

 lib_LTLIBRARIES = libkdcraw.la

 libkdcraw_la_SOURCES = dcrawbinary.cpp kdcraw.cpp dcrawsettingswidget.cpp

-libkdcraw_version_info = 0:1:0
-libkdcraw_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info $(libkdcraw_version_info) -no-undefined
+libkdcraw_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info $(VERSION_INFO) -no-undefined
 libkdcraw_la_LIBADD  = $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)

 libkdcrawinclude_HEADERS = rawdecodingsettings.h kdcraw.h dcrawbinary.h dcrawsettingswidget.h \
Index: libkdcraw/configure.in.in
===================================================================
--- libkdcraw/configure.in.in   (revision 674730)
+++ libkdcraw/configure.in.in   (revision 674731)
@@ -1,7 +1,20 @@
 AC_ARG_VAR(PKGCONFIGFOUND, [Path to pkg-config])
 AC_CHECK_PROG(PKGCONFIGFOUND, pkg-config,[yes])

+#-----------------------------------------------------------------
+# Library API version
 # -----------------------------------------------------------------
+
+ABI_MAJOR=1
+VERSION_INFO="1:0:0"
+
+AC_SUBST(ABI_MAJOR)
+AC_SUBST(VERSION_INFO)
+
+KDCRAW_DIR="\$(libdir)/libkdcraw\$(ABI_MAJOR)"
+AC_SUBST(KDCRAW_DIR)
+
+# -----------------------------------------------------------------
 # lcms check
 # -----------------------------------------------------------------



-- 
  To me vi is Zen.  To use vi is to practice zen. Every command is
  a koan. Profound to the user, unintelligible to the uninitiated.
  You discover truth everytime you use it.
                                      -- reddy at lion.austin.ibm.com