API tools faq
paste
Advertisement
h3xx

splashutils-1.5.4.4_bugfix_shared_linking_and_path_fix.patch

h3xx
Aug 19th, 2011
611
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 8.12 KB | None | 0 0
raw download clone embed print report
  1. diff -ru splashutils-1.5.4.4.orig/src/Makefile.am splashutils-1.5.4.4/src/Makefile.am
  2. --- splashutils-1.5.4.4.orig/src/Makefile.am    2011-06-12 16:43:39.000000000 -0500
  3. +++ splashutils-1.5.4.4/src/Makefile.am 2011-07-31 21:07:23.000000000 -0500
  4. @@ -189,7 +189,7 @@
  5.  fbsplashctl_SOURCES         = $(fbsplashd_SOURCES) $(splash_util_SOURCES) fbsplashctl.c
  6.  fbsplashctl_CFLAGS          = $(AM_CFLAGS) $(PTHREAD_STATIC_CFLAGS) $(RT_CFLAGS) $(libfbsplashrender_la_CFLAGS) -DUNIFIED_BUILD
  7.  fbsplashctl_CPPFLAGS        = $(fbsplashd_CPPFLAGS) $(splash_util_CPPFLAGS)
  8. -fbsplashctl_LDFLAGS         = $(AM_LDFLAGS) -all-static
  9. +fbsplashctl_LDFLAGS         = $(AM_LDFLAGS)
  10.  fbsplashctl_LDADD           = libfbsplashrender.la libfbsplash.la $(PTHREAD_STATIC_LIBS) $(RT_LIBS) $(GPM_LIBS)
  11.  
  12.  if CONFIG_FBCON_DECOR
  13. diff -ru splashutils-1.5.4.4.orig/src/Makefile.in splashutils-1.5.4.4/src/Makefile.in
  14. --- splashutils-1.5.4.4.orig/src/Makefile.in    2011-06-12 16:45:11.000000000 -0500
  15. +++ splashutils-1.5.4.4/src/Makefile.in 2011-07-31 21:08:07.000000000 -0500
  16. @@ -540,7 +540,7 @@
  17.  @CONFIG_STATIC_BINARIES_TRUE@  $(fbsplashd_CPPFLAGS) \
  18.  @CONFIG_STATIC_BINARIES_TRUE@  $(splash_util_CPPFLAGS) \
  19.  @CONFIG_STATIC_BINARIES_TRUE@  $(am__append_12)
  20. -@CONFIG_STATIC_BINARIES_TRUE@fbsplashctl_LDFLAGS = $(AM_LDFLAGS) -all-static
  21. +@CONFIG_STATIC_BINARIES_TRUE@fbsplashctl_LDFLAGS = $(AM_LDFLAGS)
  22.  @CONFIG_STATIC_BINARIES_TRUE@fbsplashctl_LDADD = libfbsplashrender.la libfbsplash.la $(PTHREAD_STATIC_LIBS) $(RT_LIBS) $(GPM_LIBS)
  23.  @CONFIG_KLIBC_FALSE@fbcondecor_helper_SOURCES = kernel.c libfbsplash.c \
  24.  @CONFIG_KLIBC_FALSE@   libfbsplashrender.c fbcon_decor.c common.c \
  25. diff -ru splashutils-1.5.4.4.orig/scripts/splash_manager.in splashutils-1.5.4.4/scripts/splash_manager.in
  26. --- splashutils-1.5.4.4.orig/scripts/splash_manager.in  2011-06-12 16:43:39.000000000 -0500
  27. +++ splashutils-1.5.4.4/scripts/splash_manager.in   2011-08-09 23:44:32.000000000 -0500
  28. @@ -197,7 +197,7 @@
  29.     local cres=$2
  30.     local action=$3
  31.  
  32. -   if [ -z $(cat "${themedir}/${ctheme}/${cres}.cfg" 2>/dev/null | egrep "^silent(pic|jpeg)=") ]; then
  33. +   if [ -z "$(cat "${themedir}/${ctheme}/${cres}.cfg" 2>/dev/null | egrep "^silent(pic|jpeg)=")" ]; then
  34.         [ "${action}" == "test" ] && return 1
  35.         err "Theme '${ctheme}' doesn't support the silent splash mode."
  36.         exit 1
  37. diff -ru splashutils-1.5.4.4.orig/scripts/Makefile.am splashutils-1.5.4.4/scripts/Makefile.am
  38. --- splashutils-1.5.4.4.orig/scripts/Makefile.am    2011-06-12 16:43:39.000000000 -0500
  39. +++ splashutils-1.5.4.4/scripts/Makefile.am 2011-08-01 23:21:33.000000000 -0500
  40. @@ -16,6 +16,8 @@
  41.         -e 's|@bindir[@]|$(eexecbindir)|g' \
  42.         -e 's|@sbindir[@]|$(eexecsbindir)|g' \
  43.         -e 's|@sysconfdir[@]|$(sysconfdir)|g' \
  44. +       -e 's|@localstatedir[@]|$(localstatedir)|g' \
  45. +       -e 's|@prefix[@]|$(prefix)|g' \
  46.         -e 's|@themedir[@]|$(themedir)|g' \
  47.         -e 's|@libdir[@]|$(eexeclibdir)|g' \
  48.         > $@
  49. diff -ru splashutils-1.5.4.4.orig/scripts/Makefile.in splashutils-1.5.4.4/scripts/Makefile.in
  50. --- splashutils-1.5.4.4.orig/scripts/Makefile.in    2011-06-12 16:45:10.000000000 -0500
  51. +++ splashutils-1.5.4.4/scripts/Makefile.in 2011-08-01 23:21:33.000000000 -0500
  52. @@ -532,6 +532,8 @@
  53.         -e 's|@bindir[@]|$(eexecbindir)|g' \
  54.         -e 's|@sbindir[@]|$(eexecsbindir)|g' \
  55.         -e 's|@sysconfdir[@]|$(sysconfdir)|g' \
  56. +       -e 's|@localstatedir[@]|$(localstatedir)|g' \
  57. +       -e 's|@prefix[@]|$(prefix)|g' \
  58.         -e 's|@themedir[@]|$(themedir)|g' \
  59.         -e 's|@libdir[@]|$(eexeclibdir)|g' \
  60.         > $@
  61. diff -ru splashutils-1.5.4.4.orig/scripts/splash-functions.sh.in splashutils-1.5.4.4/scripts/splash-functions.sh.in
  62. --- splashutils-1.5.4.4.orig/scripts/splash-functions.sh.in 2011-06-12 16:43:39.000000000 -0500
  63. +++ splashutils-1.5.4.4/scripts/splash-functions.sh.in  2011-08-01 23:21:33.000000000 -0500
  64. @@ -22,14 +22,14 @@
  65.  # default value.
  66.  export spl_cachesize="4096"
  67.  export spl_cachetype="tmpfs"
  68. -export spl_cachedir="@libdir@/splash/cache"
  69. -export spl_tmpdir="@libdir@/splash/tmp"
  70. +export spl_cachedir="@localstatedir@/run/splash/cache"
  71. +export spl_tmpdir="@localstatedir@/run/splash/tmp"
  72.  export spl_fifo="${spl_cachedir}/.splash"
  73.  export spl_pidfile="${spl_cachedir}/daemon.pid"
  74.  export spl_util="@sbindir@/splash_util.static"
  75.  export spl_daemon="@sbindir@/fbsplashd.static"
  76.  export spl_decor="@sbindir@/fbcondecor_ctl.static"
  77. -export spl_bindir="@libdir@/splash/bin"
  78. +export spl_bindir="@localstatedir@/run/splash/bin"
  79.  
  80.  # This is the main function which handles all events.
  81.  # Accepted parameters:
  82. diff -ru splashutils-1.5.4.4.orig/scripts/splash_geninitramfs.in splashutils-1.5.4.4/scripts/splash_geninitramfs.in
  83. --- splashutils-1.5.4.4.orig/scripts/splash_geninitramfs.in 2011-06-12 16:43:39.000000000 -0500
  84. +++ splashutils-1.5.4.4/scripts/splash_geninitramfs.in  2011-08-01 23:21:33.000000000 -0500
  85. @@ -149,7 +149,7 @@
  86.  fi
  87.  
  88.  printv "o Creating directory structure.."
  89. -mkdir -p ${imgdir}/{dev,dev/fb,dev/misc,dev/vc,$themedir,@libdir@/splash/proc,root,sbin,@libdir@/splash/sys}
  90. +mkdir -p ${imgdir}/{dev,dev/fb,dev/misc,dev/vc,$themedir,@localstatedir@/run/splash/proc,root,sbin,@localstatedir@/run/splash/sys}
  91.  
  92.  if [ $EUID == 0 ]; then
  93.     [[ ! -e "${imgdir}/dev/null" ]]     && mknod "${imgdir}/dev/null" c 1 3
  94. diff -ru splashutils-1.5.4.4.orig/scripts/splash_manager.in splashutils-1.5.4.4/scripts/splash_manager.in
  95. --- splashutils-1.5.4.4.orig/scripts/splash_manager.in  2011-06-12 16:43:39.000000000 -0500
  96. +++ splashutils-1.5.4.4/scripts/splash_manager.in   2011-08-01 23:22:22.000000000 -0500
  97. @@ -25,7 +25,7 @@
  98.  spl_util=splash_util.static
  99.  spl_daemon=fbsplashd.static
  100.  spl_decor=fbcondecor_ctl
  101. -spl_dir="@libdir@/splash"
  102. +spl_dir="@localstatedir@/run/splash"
  103.  spl_fifo=${spl_dir}/cache/.splash
  104.  spl_pidfile=${spl_dir}/cache/daemon.pid
  105.  themedir="@themedir@"
  106. @@ -897,7 +897,7 @@
  107.  }
  108.  
  109.  # Set some useful variables that we'll be using in various places
  110. -ctty=$(${spl_dir}/bin/fgconsole)
  111. +ctty=$(@prefix@@bindir@/fgconsole)
  112.  
  113.  # Default settings
  114.  steps=100
  115. @@ -941,7 +941,7 @@
  116.     exit 0
  117.  fi
  118.  
  119. -rres=$(${spl_dir}/bin/fbres)
  120. +rres=$(@prefix@@bindir@/fbres)
  121.  res=$(${spl_util} -c getres -t ${theme})
  122.  yres=${res#*x}
  123.  xres=${res%x*}
  124. diff -ru splashutils-1.5.4.4.orig/src/Makefile.am splashutils-1.5.4.4/src/Makefile.am
  125. --- splashutils-1.5.4.4.orig/src/Makefile.am    2011-06-12 16:43:39.000000000 -0500
  126. +++ splashutils-1.5.4.4/src/Makefile.am 2011-08-01 23:21:33.000000000 -0500
  127. @@ -83,6 +83,7 @@
  128.         -e 's|@bindir[@]|$(eexecbindir)|g' \
  129.         -e 's|@sbindir[@]|$(eexecsbindir)|g' \
  130.         -e 's|@sysconfdir[@]|$(sysconfdir)|g' \
  131. +       -e 's|@localstatedir[@]|$(localstatedir)|g' \
  132.         -e 's|@themedir[@]|$(themedir)|g' \
  133.         -e 's|@libdir[@]|$(eexeclibdir)|g' \
  134.         > $@
  135. diff -ru splashutils-1.5.4.4.orig/src/Makefile.in splashutils-1.5.4.4/src/Makefile.in
  136. --- splashutils-1.5.4.4.orig/src/Makefile.in    2011-06-12 16:45:11.000000000 -0500
  137. +++ splashutils-1.5.4.4/src/Makefile.in 2011-08-01 23:21:33.000000000 -0500
  138. @@ -1691,6 +1691,7 @@
  139.         -e 's|@bindir[@]|$(eexecbindir)|g' \
  140.         -e 's|@sbindir[@]|$(eexecsbindir)|g' \
  141.         -e 's|@sysconfdir[@]|$(sysconfdir)|g' \
  142. +       -e 's|@localstatedir[@]|$(localstatedir)|g' \
  143.         -e 's|@themedir[@]|$(themedir)|g' \
  144.         -e 's|@libdir[@]|$(eexeclibdir)|g' \
  145.         > $@
  146. diff -ru splashutils-1.5.4.4.orig/src/daemon_cmd.c splashutils-1.5.4.4/src/daemon_cmd.c
  147. --- splashutils-1.5.4.4.orig/src/daemon_cmd.c   2011-06-12 16:43:39.000000000 -0500
  148. +++ splashutils-1.5.4.4/src/daemon_cmd.c    2011-08-01 23:21:33.000000000 -0500
  149. @@ -486,7 +486,7 @@
  150.  {
  151.     svc_state *ss;
  152.     item *i;
  153. -   FILE *fp = fopen("/lib/splash/cache/svc_timings", "w");
  154. +   FILE *fp = fopen(FBSPLASH_CACHEDIR"/svc_timings", "w");
  155.  
  156.     if (!fp)
  157.         return -1;
  158. diff -ru splashutils-1.5.4.4.orig/src/fbsplash.h.in splashutils-1.5.4.4/src/fbsplash.h.in
  159. --- splashutils-1.5.4.4.orig/src/fbsplash.h.in  2011-06-12 16:43:39.000000000 -0500
  160. +++ splashutils-1.5.4.4/src/fbsplash.h.in   2011-08-01 23:21:33.000000000 -0500
  161. @@ -6,7 +6,7 @@
  162.  #include <linux/kd.h>
  163.  #include <linux/input.h>
  164.  
  165. -#define FBSPLASH_DIR       "@libdir@/splash"
  166. +#define FBSPLASH_DIR       "@localstatedir@/run/splash"
  167.  #define FBSPLASH_CACHEDIR  FBSPLASH_DIR"/cache"
  168.  #define FBSPLASH_PIDFILE   FBSPLASH_CACHEDIR"/daemon.pid"
  169.  #define FBSPLASH_PROFILE   FBSPLASH_CACHEDIR"/profile"
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!