[gentoo-commits] gentoo-x86 commit in app-backup/kdar/files: kdar-2.1.0-desktop-file.diff kdar-2.1.0-as-needed.diff

[gentoo-commits] gentoo-x86 commit in app-backup/kdar/files: kdar-2.1.0-desktop-file.diff kdar-2.1.0-as-needed.diff

[Carsten Lohrke (carlo)]

carlo       09/02/22 15:01:50

  Added:                kdar-2.1.0-desktop-file.diff
                        kdar-2.1.0-as-needed.diff
  Log:
   Proper use dependencies. Desktop file fix.
  (Portage version: 2.2_rc23/cvs/Linux i686)

Revision  Changes    Path
1.1                  app-backup/kdar/files/kdar-2.1.0-desktop-file.diff

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/kdar/files/kdar-2.1.0-desktop-file.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/kdar/files/kdar-2.1.0-desktop-file.diff?rev=1.1&content-type=text/plain

Index: kdar-2.1.0-desktop-file.diff
===================================================================
--- src/kdar.desktop.o	2009-02-17 00:36:09.000000000 +0100
+++ src/kdar.desktop	2009-02-17 00:36:19.000000000 +0100
@@ -1,9 +1,8 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=KDar (Disk-based Archive Tool)
 Exec=kdar
 Icon=kdar
 Type=Application
-DocPath=kdar/index.html
+X-DocPath=kdar/index.html
 Comment=A KDE frontend to DAR (Disk ARchive)
-Terminal=0
+Terminal=false
--- src/Makefile.am.o	2009-02-17 00:36:43.000000000 +0100
+++ src/Makefile.am	2009-02-17 00:36:58.000000000 +0100
@@ -52,7 +52,7 @@
 KDE_ICON = AUTO
 
 # this is where the kdelnk file will go 
-kdelnkdir   = $(kde_appsdir)/Utilities
+kdelnkdir   = $(xdg_appsdir)
 kdelnk_DATA = kdar.desktop
 
 # this is where the XML-GUI resource file goes



1.1                  app-backup/kdar/files/kdar-2.1.0-as-needed.diff

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/kdar/files/kdar-2.1.0-as-needed.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/kdar/files/kdar-2.1.0-as-needed.diff?rev=1.1&content-type=text/plain

Index: kdar-2.1.0-as-needed.diff
===================================================================
diff -ur a/configure.in.in b/configure.in.in
--- a/configure.in.in	2008-05-11 17:53:52.000000000 -0500
+++ b/configure.in.in	2009-02-13 19:30:38.000000000 -0600
@@ -34,29 +34,28 @@
 	       [AC_HELP_STRING(--enable-mode=arg, [where arg is 32 or 64. Make kdar use 32 bit or 64 bit integers in place of infinint (default=infinint)])],
 	       [build_mode=$enableval], [])
 
-MEM_LDFLAGS=$LDFLAGS
 if test "x$build_mode" = "x32"; then
 AC_MSG_CHECKING([for libdar32])
-LDFLAGS=-ldar32
-AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <dar/libdar.hpp>]],
+LIBS="-ldar32 $LIBS"
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <dar/libdar.hpp>]],
 [[using namespace libdar;
  U_I major, minor;
-get_version(major, minor);]])], [LIBS="$LIBS -ldar32"
+get_version(major, minor);]])], [
 AC_MSG_RESULT([yes])], [AC_MSG_ERROR([required library not found. Please install libdar32.])])
 fi
 if test "x$build_mode" = "x64"; then
 AC_MSG_CHECKING([for libdar64])
-LDFLAGS=-ldar64
-AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <dar/libdar.hpp>]],
+LIBS="-ldar64 $LIBS"
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <dar/libdar.hpp>]],
 [[using namespace libdar;
 U_I major, minor;
-get_version(major, minor);]])], [LIBS="$LIBS -ldar64"
+get_version(major, minor);]])], [
 AC_MSG_RESULT([yes])], [AC_MSG_ERROR([required library not found. Please install libdar64.])])
 fi
 if test "x$build_mode" = "x"; then
 AC_MSG_CHECKING([for libdar])
-LDFLAGS=-ldar
-AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <dar/libdar.hpp>]],
+LIBS="-ldar $LIBS"
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <dar/libdar.hpp>]],
 [[using namespace libdar;
 U_I major, minor;
 get_version(major, minor);]])], [LIBS="$LIBS -ldar"
@@ -64,7 +63,6 @@
 AC_MSG_RESULT([yes])], [AC_MSG_ERROR([required library not found. Please install libdar.])])
 fi
 
-LDFLAGS=$MEM_LDFLAGS
 if test "x$build_mode" = "x32"; then
 CXXFLAGS="$MEM_CXXFLAGS -DLIBDAR_MODE=32"
 fi