Browse Source

Convert remaining references to kde3 (e.g. in paths) to trinity


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/krename@1248408 283d02a7-25f6-0310-bc7c-ecb5cbfe19
tpearson 7 years ago
parent
commit
e2e2ab9c6d
3 changed files with 23 additions and 23 deletions
  1. 20
    20
      acinclude.m4
  2. 1
    1
      krename.kdevelop
  3. 2
    2
      krename.spec

+ 20
- 20
acinclude.m4 View File

@@ -479,14 +479,14 @@ if test "$1" = "default"; then
479 479
     if test "$kde_qtver" = "2"; then
480 480
       kde_moduledir='\${libdir}/kde2'
481 481
     else
482
-      kde_moduledir='\${libdir}/kde3'
482
+      kde_moduledir='\${libdir}/trinity'
483 483
     fi
484 484
   fi
485 485
   if test -z "$kde_styledir"; then
486
-    kde_styledir='\${libdir}/kde3/plugins/styles'
486
+    kde_styledir='\${libdir}/trinity/plugins/styles'
487 487
   fi
488 488
   if test -z "$kde_widgetdir"; then
489
-    kde_widgetdir='\${libdir}/kde3/plugins/designer'
489
+    kde_widgetdir='\${libdir}/trinity/plugins/designer'
490 490
   fi
491 491
   if test -z "$xdg_appsdir"; then
492 492
     xdg_appsdir='\${datadir}/applications/kde'
@@ -546,7 +546,7 @@ Please check whether you installed aRts correctly or use
546 546
 
547 547
 AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
548 548
 [
549
-    kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
549
+    kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/trinity/bin /usr/kde/bin /usr/local/kde/bin"
550 550
     test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
551 551
     if test -n "$KDEDIRS"; then
552 552
        kde_save_IFS=$IFS
@@ -580,39 +580,39 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
580 580
         fi
581 581
         KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
582 582
 
583
-        kde32ornewer=1
584
-        kde33ornewer=1
583
+        trinity2ornewer=1
584
+        trinity3ornewer=1
585 585
         if test -n "$kde_qtver" && test "$kde_qtver" -lt 3; then
586
-            kde32ornewer=
587
-            kde33ornewer=
586
+            trinity2ornewer=
587
+            trinity3ornewer=
588 588
         else
589 589
             if test "$kde_qtver" = "3"; then
590 590
               if test "$kde_qtsubver" -le 1; then
591
-                kde32ornewer=
591
+                trinity2ornewer=
592 592
               fi
593 593
               if test "$kde_qtsubver" -le 2; then
594
-                kde33ornewer=
594
+                trinity3ornewer=
595 595
               fi
596 596
               if test "$KDECONFIG" != "compiled"; then
597 597
                 if test `$KDECONFIG --version | grep KDE | sed 's/KDE: \(...\).*/\1/'` = 3.2; then
598
-                  kde33ornewer=
598
+                  trinity3ornewer=
599 599
                 fi
600 600
               fi
601 601
             fi
602 602
         fi
603 603
 
604
-        if test -n "$kde32ornewer"; then
604
+        if test -n "$trinity2ornewer"; then
605 605
             KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
606 606
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
607 607
         fi
608
-        if test -n "$kde33ornewer"; then
608
+        if test -n "$trinity3ornewer"; then
609 609
             KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)])
610 610
             AC_SUBST(MAKEKDEWIDGETS)
611 611
         fi
612 612
         KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
613 613
 
614 614
         if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
615
- 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
615
+ 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/trinity/share /opt/kde/share $prefix/share"
616 616
             test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
617 617
             AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
618 618
 	    if test "$KDE_XSL_STYLESHEET" = "NO"; then
@@ -623,7 +623,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
623 623
         fi
624 624
 
625 625
         DCOP_DEPENDENCIES='$(DCOPIDL)'
626
-        if test -n "$kde32ornewer"; then
626
+        if test -n "$trinity2ornewer"; then
627 627
             KCFG_DEPENDENCIES='$(KCONFIG_COMPILER)'
628 628
             DCOP_DEPENDENCIES='$(DCOPIDL) $(DCOPIDLNG)'
629 629
             AC_SUBST(KCONFIG_COMPILER)
@@ -1793,7 +1793,7 @@ fi
1793 1793
 
1794 1794
 if test -z "$1"; then
1795 1795
 
1796
-kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
1796
+kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/trinity/include /opt/kde/include $x_includes $qt_includes"
1797 1797
 test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
1798 1798
 kde_incdirs="$ac_kde_includes $kde_incdirs"
1799 1799
 AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
@@ -1805,7 +1805,7 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail.
1805 1805
 So, check this please and use another prefix!])
1806 1806
 fi
1807 1807
 
1808
-kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
1808
+kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/trinity /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/trinity/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
1809 1809
 test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
1810 1810
 kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
1811 1811
 AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
@@ -1813,7 +1813,7 @@ ac_kde_libraries="$kde_libdir"
1813 1813
 
1814 1814
 kde_widgetdir=NO
1815 1815
 dnl this might be somewhere else
1816
-AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
1816
+AC_FIND_FILE("trinity/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
1817 1817
 
1818 1818
 if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
1819 1819
 AC_MSG_ERROR([
@@ -1821,14 +1821,14 @@ in the prefix, you've chosen, are no KDE libraries installed. This will fail.
1821 1821
 So, check this please and use another prefix!])
1822 1822
 fi
1823 1823
 
1824
-if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
1824
+if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then
1825 1825
 AC_MSG_ERROR([
1826 1826
 I can't find the designer plugins. These are required and should have been installed
1827 1827
 by kdelibs])
1828 1828
 fi
1829 1829
 
1830 1830
 if test -n "$kde_widgetdir"; then
1831
-    kde_widgetdir="$kde_widgetdir/kde3/plugins/designer"
1831
+    kde_widgetdir="$kde_widgetdir/trinity/plugins/designer"
1832 1832
 fi
1833 1833
 
1834 1834
 

+ 1
- 1
krename.kdevelop View File

@@ -23,7 +23,7 @@
23 23
       <activetarget>krename/krename</activetarget>
24 24
     </general>
25 25
     <configure>
26
-      <configargs>\s--build=i386-linux --host=i386-linux --target=i386-linux --prefix=/opt/kde3\s</configargs>
26
+      <configargs>\s--build=i386-linux --host=i386-linux --target=i386-linux --prefix=/opt/trinity\s</configargs>
27 27
     </configure>
28 28
     <make>
29 29
       <abortonerror>false</abortonerror>

+ 2
- 2
krename.spec View File

@@ -21,8 +21,8 @@ Krename is a very powerful batch file renamer for KDE3 which can rename a list o
21 21
 
22 22
 %build
23 23
 # Look for common rpm-options:
24
-if [ -f /etc/opt/kde3/common_options ]; then
25
-  . /etc/opt/kde3/common_options
24
+if [ -f /etc/opt/trinity/common_options ]; then
25
+  . /etc/opt/trinity/common_options
26 26
   ./configure $configkde
27 27
 else
28 28
   ./configure

Loading…
Cancel
Save