From kde-core-devel  Mon Jan 02 11:57:41 2006
From: =?ISO-8859-1?Q?Szombathelyi_Gy=F6rgy?= <gyurco () freemail ! hu>
Date: Mon, 02 Jan 2006 11:57:41 +0000
To: kde-core-devel
Subject: Re: KDE-QT4 plugins
Message-Id: <43B91535.6000407 () freemail ! hu>
X-MARC-Message: https://marc.info/?l=kde-core-devel&m=113620307629326
MIME-Version: 1
Content-Type: multipart/mixed; boundary="--------------070806040307040109050000"

This is a multi-part message in MIME format.
--------------070806040307040109050000
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 8bit

And here's the patch.

Should I commit?

Szombathelyi György wrote:

> 
> Last word: as I see now the KImgIO plugins converted to Qt's imageformat 
> plugins, should't they installed in plugins/imageformats?
> 
> Happy new year,
> György
> 
> 


--------------070806040307040109050000
Content-Type: text/plain;
 name="imageformats-admin.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="imageformats-admin.diff"

Index: admin/acinclude.m4.in
===================================================================
--- admin/acinclude.m4.in	(revision 493368)
+++ admin/acinclude.m4.in	(working copy)
@@ -386,6 +386,7 @@
 	kde_servicetypesdir=\"$kde_servicetypesdir\" \
 	kde_moduledir=\"$kde_moduledir\" \
 	kde_styledir=\"$kde_styledir\" \
+	kde_imageformatsdir=\"$kde_imageformatsdir\" \
 	kde_widgetdir=\"$kde_widgetdir\" \
 	xdg_appsdir=\"$xdg_appsdir\" \
 	xdg_menudir=\"$xdg_menudir\" \
@@ -450,6 +451,9 @@
   if test -z "$kde_styledir"; then
     kde_styledir='\${libdir}/kde4/plugins/styles'
   fi
+  if test -z "$kde_imageformatsdir"; then
+    kde_imageformatsdir='\${libdir}/kde4/plugins/imageformats'
+  fi
   if test -z "$kde_widgetdir"; then
     kde_widgetdir='\${libdir}/kde4/plugins/designer'
   fi
@@ -477,7 +481,8 @@
    test -z "$kde_wallpaperdir" || test -z "$kde_templatesdir" ||
    test -z "$kde_bindir" || test -z "$kde_servicesdir" ||
    test -z "$kde_servicetypesdir" || test -z "$kde_moduledir" ||
-   test -z "$kde_styledir" || test -z "$kde_widgetdir" ||
+   test -z "$kde_styledir" || test -z "kde_imageformatsdir" ||
+   test -z "$kde_widgetdir" ||
    test -z "$xdg_appsdir" || test -z "$xdg_menudir" || test -z "$xdg_directorydir" ||
    test "x$kde_have_all_paths" != "xyes"; then
      kde_have_all_paths=no
@@ -600,6 +605,7 @@
   kde_bindir= kde_servicesdir= kde_servicetypesdir= kde_moduledir=
   kde_have_all_paths=
   kde_styledir=
+  kde_imageformatsdir=
   kde_widgetdir=
   xdg_appsdir = xdg_menudir= xdg_directorydir=
   KDE_SET_DEFAULT_PATHS($1)
@@ -649,6 +655,7 @@
 AC_SUBST(kde_moduledir)
 AC_SUBST(kdeinitdir, '$(kde_moduledir)')
 AC_SUBST(kde_styledir)
+AC_SUBST(kde_imageformatsdir)
 AC_SUBST(kde_widgetdir)
 dnl AC_SUBST(kde_minidir)
 dnl AC_SUBST(kde_cgidir)

--------------070806040307040109050000
Content-Type: text/plain;
 name="imageformats-kdelibs.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="imageformats-kdelibs.diff"

Index: kimgio/Makefile.am
===================================================================
--- kimgio/Makefile.am	(revision 493367)
+++ kimgio/Makefile.am	(working copy)
@@ -17,7 +17,7 @@
 KDE_CXXFLAGS = $(USE_EXCEPTIONS)
 
 # kimg_hdr.la missing and JP2_MODULES
-kde_module_LTLIBRARIES= kimg_eps.la kimg_xview.la  \
+kde_imageformats_LTLIBRARIES= kimg_eps.la kimg_xview.la  \
 	$(KIMGIO_TIFF_MODULES) kimg_ico.la \
 	kimg_pcx.la kimg_tga.la kimg_rgb.la kimg_xcf.la kimg_dds.la  \
 	$(KIMGIO_EXR_MODULES) kimg_psd.la 

--------------070806040307040109050000--