Skip to content
This repository
Browse code

dos2unix, filezilla, fotoxx, gphoto2, k3b, kmymoney, libdatrie, libgp…

…hoto2, libimobiledevice, libssh2, lvm2, mpfr, q4wine, scite, sudo, tracker, tmpwatch, upower, usbmuxd, vbam, vlc, vlgothic-fonts, vsftpd
  • Loading branch information...
commit f444d0d6ced4ae2bc02a5866f8e171b58fb6b3d2 1 parent ab80edb
Phantom X authored August 20, 2010

Showing 132 changed files with 3,389 additions and 256 deletions. Show diff stats Hide diff stats

  1. 108  ChangeLog.All
  2. 4  dos2unix/ChangeLog.SB
  3. 6  dos2unix/apply-patches.sh
  4. 3  dos2unix/dos2unix.SlackBuild
  5. 4  filezilla/ChangeLog.SB
  6. 2  filezilla/filezilla.SlackBuild
  7. 2  fonts/freefont-ttf/freefont-ttf.SlackBuild
  8. BIN  fonts/vlgothic-fonts/59-VLGothic-monospace.conf.gz
  9. BIN  fonts/vlgothic-fonts/59-VLGothic-proportional.conf.gz
  10. 4  fonts/vlgothic-fonts/ChangeLog.SB
  11. 53  fonts/vlgothic-fonts/vlgothic-fontconfig-gothic.conf
  12. 33  fonts/vlgothic-fonts/vlgothic-fontconfig-pgothic.conf
  13. 19  fonts/vlgothic-fonts/vlgothic-fonts.SlackBuild
  14. 4  fotoxx/ChangeLog.SB
  15. 2  fotoxx/fotoxx.SlackBuild
  16. 4  glibc/ChangeLog.SB
  17. 3  glibc/apply-patches.sh
  18. 4  glibc/glibc.SlackBuild
  19. 4  gnome/epiphany-extensions/ChangeLog.SB
  20. 9  gnome/epiphany-extensions/epiphany-extensions.SlackBuild
  21. 4  gnome/rhythmbox/ChangeLog.SB
  22. 13  gnome/rhythmbox/apply-patches.sh
  23. 32  gnome/rhythmbox/patches/0001-Don-t-load-AFC-devices-using-the-MTP-plugin.patch
  24. 261  gnome/rhythmbox/patches/rb-no-HEAD-for-podcasts.patch
  25. 171  gnome/rhythmbox/patches/rhythmbox-0.12-python-initialization.patch
  26. 48  gnome/rhythmbox/patches/rhythmbox-0.12.8-namespace-conflict.patch
  27. 12  gnome/rhythmbox/rhythmbox.SlackBuild
  28. 3  gnome/rhythmbox/slack-required
  29. 4  gnome/tracker/ChangeLog.SB
  30. 2  gnome/tracker/tracker.SlackBuild
  31. 4  gpgme/ChangeLog.SB
  32. 11  gpgme/apply-patches.sh
  33. 19  gpgme/gpgme.SlackBuild
  34. 0  gpgme/{ → patches}/gpgme-1.1.8-config_extras.patch.gz
  35. 48  gpgme/patches/gpgme-1.2.0-ImplicitDSOLinking.patch
  36. 24  gpgme/patches/gpgme-1.2.0-largefile.patch
  37. 4  gphoto2/ChangeLog.SB
  38. 2  gphoto2/gphoto2.SlackBuild
  39. 1  gvfs/slack-required
  40. 4  kde-apps/kmymoney/ChangeLog.SB
  41. 2  kde-apps/kmymoney/kmymoney.SlackBuild
  42. 4  kde/k3b/ChangeLog.SB
  43. 2  kde/k3b/k3b.SlackBuild
  44. 4  libdatrie/ChangeLog.SB
  45. 2  libdatrie/libdatrie-compat32.SlackBuild
  46. 6  libdatrie/libdatrie.SlackBuild
  47. 4  libgphoto2/ChangeLog.SB
  48. 2  libgphoto2/apply-patches.sh
  49. 17  libgphoto2/libgphoto2-compat32.SlackBuild
  50. 17  libgphoto2/libgphoto2.SlackBuild
  51. 11  libgphoto2/patches/libgphoto2-st2205-compile.patch
  52. 1  libgpod/slack-required
  53. 4  libimobiledevice/ChangeLog.SB
  54. 219  libimobiledevice/libimobiledevice.SlackBuild
  55. 12  libimobiledevice/slack-desc
  56. 5  libimobiledevice/slack-required
  57. 4  libproxy/ChangeLog.SB
  58. 18  libproxy/libproxy.SlackBuild
  59. 4  libssh2/ChangeLog.SB
  60. 6  libssh2/libssh2.SlackBuild
  61. 4  lvm2/ChangeLog.SB
  62. 1  lvm2/apply-patches.sh
  63. 2  lvm2/lvm2-compat32.SlackBuild
  64. 2  lvm2/lvm2.SlackBuild
  65. 138  lvm2/patches/lvm2-2_02_73-fix-exported-syms.patch
  66. 1  mpfr/.gitignore
  67. 4  mpfr/ChangeLog.SB
  68. 12  mpfr/apply-patches.sh
  69. 26  mpfr/mpfr-compat32.SlackBuild
  70. 26  mpfr/mpfr.SlackBuild
  71. 4  polkit/ChangeLog.SB
  72. 12  polkit/apply-patches.sh
  73. 76  polkit/patches/polkit-0.97-subject-scanning.patch
  74. 14  polkit/polkit.SlackBuild
  75. 4  python-modules/python-coherence/ChangeLog.SB
  76. 203  python-modules/python-coherence/python-coherence.SlackBuild
  77. 12  python-modules/python-coherence/slack-desc
  78. 3  python-modules/python-coherence/slack-required
  79. 4  python-modules/python-louie/ChangeLog.SB
  80. 190  python-modules/python-louie/python-louie.SlackBuild
  81. 12  python-modules/python-louie/slack-desc
  82. 2  python-modules/python-louie/slack-required
  83. 4  python-modules/python-nose/ChangeLog.SB
  84. 9  python-modules/python-nose/apply-patches.sh
  85. 316  python-modules/python-nose/patches/python-nose-r708-through-r111-py27-fixes.patch
  86. 193  python-modules/python-nose/python-nose.SlackBuild
  87. 12  python-modules/python-nose/slack-desc
  88. 1  python-modules/python-nose/slack-required
  89. 4  python/ChangeLog.SB
  90. 3  python/apply-patches.sh
  91. 12  python/patches/fix-test_commands-expected-ls-output-issue7108.patch
  92. 20  python/patches/less-verbose-COUNT_ALLOCS.patch
  93. 28  python/patches/python-2.7rc1-lib64-slk.patch
  94. 4  python/python.SlackBuild
  95. 4  q4wine/ChangeLog.SB
  96. 2  q4wine/q4wine.SlackBuild
  97. 4  scite/ChangeLog.SB
  98. 2  scite/scite.SlackBuild
  99. 4  sdl/sdl/ChangeLog.SB
  100. 2  sdl/sdl/apply-patches.sh
  101. 19  sdl/sdl/patches/SDL-1.2.14-linux_2.6_joystick.patch
  102. 2  sdl/sdl/sdl-compat32.SlackBuild
  103. 2  sdl/sdl/sdl.SlackBuild
  104. 4  sudo/ChangeLog.SB
  105. 2  sudo/sudo.SlackBuild
  106. 4  tinyxml/ChangeLog.SB
  107. 2  tinyxml/apply-patches.sh
  108. 64  tinyxml/patches/entity.patch
  109. 2  tinyxml/tinyxml.SlackBuild
  110. 4  tmpwatch/ChangeLog.SB
  111. 7  tmpwatch/tmpwatch.SlackBuild
  112. 4  upower/ChangeLog.SB
  113. 13  upower/apply-patches.sh
  114. 44  upower/patches/upower-0.9.6-ensure-gerror-is-init.patch
  115. 291  upower/patches/upower-dbus-fixes.patch
  116. 3  upower/slack-required
  117. 12  upower/upower.SlackBuild
  118. 4  usbmuxd/ChangeLog.SB
  119. 12  usbmuxd/slack-desc
  120. 2  usbmuxd/slack-required
  121. 291  usbmuxd/usbmuxd.SlackBuild
  122. 4  util-linux-ng/ChangeLog.SB
  123. 4  util-linux-ng/apply-patches.sh
  124. 147  util-linux-ng/patches/util-linux-ng-2.18-agetty-baudrate.patch
  125. 14  util-linux-ng/patches/{util-linux-ng-2.17-agetty-clocal.patch → util-linux-ng-2.18-agetty-clocal.patch}
  126. 2  util-linux-ng/util-linux-ng-compat32.SlackBuild
  127. 2  util-linux-ng/util-linux-ng.SlackBuild
  128. 4  vbam/ChangeLog.SB
  129. 4  vlc/ChangeLog.SB
  130. 15  vlc/vlc.SlackBuild
  131. 4  vsftpd/ChangeLog.SB
  132. 2  vsftpd/vsftpd.SlackBuild
108  ChangeLog.All
... ...
@@ -1,3 +1,111 @@
  1
+Fri Aug 20 03:06:12 BRT 2010
  2
+glibc-2.12.1-x86_64-2xinc.tgz
  3
++--------------------------+
  4
+Fri Aug 20 00:40:18 BRT 2010
  5
+vbam-20100820-x86_64-1xinc.tgz
  6
++--------------------------+
  7
+Thu Aug 19 23:15:33 BRT 2010
  8
+rhythmbox-0.12.8-x86_64-2xinc.tgz
  9
++--------------------------+
  10
+Thu Aug 19 23:11:17 BRT 2010
  11
+python-coherence-0.6.6.2-x86_64-1xinc.tgz
  12
++--------------------------+
  13
+Thu Aug 19 23:03:19 BRT 2010
  14
+python-louie-1.1-x86_64-1xinc.tgz
  15
++--------------------------+
  16
+Thu Aug 19 22:59:21 BRT 2010
  17
+python-nose-0.11.3-x86_64-1xinc.tgz
  18
++--------------------------+
  19
+Thu Aug 19 20:14:05 BRT 2010
  20
+mpfr-3.0.0.p3-x86_64-1xinc.tgz
  21
++--------------------------+
  22
+Thu Aug 19 19:40:02 BRT 2010
  23
+libdatrie-0.2.4-x86_64-1xinc.tgz
  24
++--------------------------+
  25
+Thu Aug 19 19:13:50 BRT 2010
  26
+tinyxml-2.6.1-x86_64-2xinc.tgz
  27
++--------------------------+
  28
+Thu Aug 19 19:09:44 BRT 2010
  29
+filezilla-3.3.4.1-x86_64-1xinc.tgz
  30
++--------------------------+
  31
+Thu Aug 19 18:46:16 BRT 2010
  32
+tracker-0.8.16-x86_64-1xinc.tgz
  33
++--------------------------+
  34
+Thu Aug 19 18:43:00 BRT 2010
  35
+sudo-1.7.4p3-x86_64-1xinc.tgz
  36
++--------------------------+
  37
+Thu Aug 19 18:41:13 BRT 2010
  38
+scite-2.20-x86_64-1xinc.tgz
  39
++--------------------------+
  40
+Thu Aug 19 13:51:15 BRT 2010
  41
+polkit-0.96-x86_64-3xinc.tgz
  42
++--------------------------+
  43
+Thu Aug 19 13:40:45 BRT 2010
  44
+python-2.7-x86_64-2xinc.tgz
  45
++--------------------------+
  46
+Thu Aug 19 13:34:44 BRT 2010
  47
+gpgme-1.3.0-x86_64-2xinc.tgz
  48
++--------------------------+
  49
+Thu Aug 19 13:29:33 BRT 2010
  50
+util-linux-ng-2.18-x86_64-3xinc.tgz
  51
++--------------------------+
  52
+Thu Aug 19 13:14:52 BRT 2010
  53
+vlgothic-fonts-20100818-noarch-1xinc.tgz
  54
++--------------------------+
  55
+Thu Aug 19 13:03:33 BRT 2010
  56
+lvm2-2.02.73-x86_64-1xinc.tgz
  57
++--------------------------+
  58
+Thu Aug 19 12:13:49 BRT 2010
  59
+libproxy-0.4.4-x86_64-2xinc.tgz
  60
++--------------------------+
  61
+Thu Aug 19 11:41:57 BRT 2010
  62
+vlc-1.1.3-x86_64-1xinc.tgz
  63
++--------------------------+
  64
+Thu Aug 19 11:39:43 BRT 2010
  65
+epiphany-extensions-2.30.2-x86_64-1xinc.tgz
  66
++--------------------------+
  67
+Thu Aug 19 11:33:57 BRT 2010
  68
+q4wine-0.119.r1-x86_64-1xinc.tgz
  69
++--------------------------+
  70
+Thu Aug 19 11:32:41 BRT 2010
  71
+vsftpd-2.3.1-x86_64-1xinc.tgz
  72
++--------------------------+
  73
+Thu Aug 19 11:31:23 BRT 2010
  74
+dos2unix-5.1.1-x86_64-1xinc.tgz
  75
++--------------------------+
  76
+Wed Aug 18 23:04:38 BRT 2010
  77
+tmpwatch-2.10.1-x86_64-1xinc.tgz
  78
++--------------------------+
  79
+Wed Aug 18 22:21:30 BRT 2010
  80
+kmymoney-4.5-x86_64-1xinc.tgz
  81
++--------------------------+
  82
+Wed Aug 18 21:55:23 BRT 2010
  83
+k3b-2.0.1-x86_64-1xinc.tgz
  84
++--------------------------+
  85
+Wed Aug 18 14:10:08 BRT 2010
  86
+upower-0.9.5-x86_64-1xinc.tgz
  87
++--------------------------+
  88
+Wed Aug 18 14:09:05 BRT 2010
  89
+libimobiledevice-1.0.2-x86_64-1xinc.tgz
  90
++--------------------------+
  91
+Wed Aug 18 13:51:36 BRT 2010
  92
+usbmuxd-1.0.5-x86_64-1xinc.tgz
  93
++--------------------------+
  94
+Wed Aug 18 13:42:54 BRT 2010
  95
+gphoto2-2.4.10-x86_64-1xinc.tgz
  96
++--------------------------+
  97
+Wed Aug 18 13:25:47 BRT 2010
  98
+libgphoto2-2.4.10-x86_64-1xinc.tgz
  99
++--------------------------+
  100
+Wed Aug 18 13:21:18 BRT 2010
  101
+fotoxx-10.8.4-x86_64-1xinc.tgz
  102
++--------------------------+
  103
+Wed Aug 18 13:20:12 BRT 2010
  104
+libssh2-1.2.7-x86_64-1xinc.tgz
  105
++--------------------------+
  106
+Wed Aug 18 13:18:06 BRT 2010
  107
+sdl-1.2.14-x86_64-5xinc.tgz
  108
++--------------------------+
1 109
 Tue Aug 17 19:42:31 BRT 2010
2 110
 qbittorrent-2.3.1-x86_64-1xinc.tgz
3 111
 +--------------------------+
4  dos2unix/ChangeLog.SB
... ...
@@ -1,3 +1,7 @@
  1
+Thu Aug 19 11:31:23 BRT 2010
  2
+dos2unix-5.1.1-x86_64-1xinc.tgz:
  3
+Updated to 5.1.1.
  4
++--------------------------+
1 5
 Sat Apr  3 16:35:29 BRT 2010
2 6
 dos2unix-5.1-x86_64-1xinc.tgz:
3 7
 Updated to 5.1.
6  dos2unix/apply-patches.sh
... ...
@@ -1,2 +1,8 @@
1 1
 
  2
+set -e -o pipefail
  3
+
2 4
 SB_PATCHDIR=${CWD}/patches
  5
+
  6
+# patch -p0 -E --backup --verbose -i ${SB_PATCHDIR}/${NAME}.patch
  7
+
  8
+set +e +o pipefail
3  dos2unix/dos2unix.SlackBuild
@@ -43,7 +43,7 @@ fi
43 43
 NAME=dos2unix
44 44
 PKG=${PKG:-${TMP}/package-${NAME}}
45 45
 
46  
-VERSION=${VERSION:-5.1}
  46
+VERSION=${VERSION:-5.1.1}
47 47
 if [ "${SB_NATIVE}" = "YES" ] ;then
48 48
   ARCH=${ARCH:-$(uname -m)}
49 49
 else
@@ -108,7 +108,6 @@ cd ${SRCDIR} || exit 1
108 108
 
109 109
 chmod -R u+w,go+r-w,a-s .
110 110
 
111  
-# zcat ${CWD}/${NAME}.patch.gz | patch -p0 -E --backup --verbose || exit 1
112 111
 if [ -r ${CWD}/apply-patches.sh ]; then
113 112
   . ${CWD}/apply-patches.sh || exit 1
114 113
 fi
4  filezilla/ChangeLog.SB
... ...
@@ -1,3 +1,7 @@
  1
+Thu Aug 19 19:09:44 BRT 2010
  2
+filezilla-3.3.4.1-x86_64-1xinc.tgz:
  3
+Updated to 3.3.4.1.
  4
++--------------------------+
1 5
 Mon Jun 14 16:57:08 BRT 2010
2 6
 filezilla-3.3.3-x86_64-1xinc.tgz:
3 7
 Updated to 3.3.3.
2  filezilla/filezilla.SlackBuild
@@ -44,7 +44,7 @@ PNAME=FileZilla
44 44
 NAME=filezilla
45 45
 PKG=${PKG:-${TMP}/package-${NAME}}
46 46
 
47  
-VERSION=${VERSION:-3.3.3}
  47
+VERSION=${VERSION:-3.3.4.1}
48 48
 if [ "${SB_NATIVE}" = "YES" ] ;then
49 49
   ARCH=${ARCH:-$(uname -m)}
50 50
 else
2  fonts/freefont-ttf/freefont-ttf.SlackBuild
@@ -120,7 +120,7 @@ mkdir -p ${PKG}/etc/fonts/conf.{avail,d}
120 120
 for type in mono sans serif ; do
121 121
   file=${PNAME}-${type}.conf
122 122
   zcat ${CWD}/${file}.gz > ${PKG}/etc/fonts/conf.avail/67-${file}
123  
-  ln -s ../conf.avail/${file} ${PKG}/etc/fonts/conf.d/67-${file}
  123
+  ln -s ../conf.avail/67-${file} ${PKG}/etc/fonts/conf.d/67-${file}
124 124
 done
125 125
 
126 126
 # Add a documentation directory:
BIN  fonts/vlgothic-fonts/59-VLGothic-monospace.conf.gz
Binary file not shown
BIN  fonts/vlgothic-fonts/59-VLGothic-proportional.conf.gz
Binary file not shown
4  fonts/vlgothic-fonts/ChangeLog.SB
... ...
@@ -1,3 +1,7 @@
  1
+Thu Aug 19 13:14:52 BRT 2010
  2
+vlgothic-fonts-20100818-noarch-1xinc.tgz:
  3
+Updated to 20100818.
  4
++--------------------------+
1 5
 Tue Apr 20 15:41:05 BRT 2010
2 6
 vlgothic-fonts-20100416-noarch-1xinc.tgz:
3 7
 Updated to 20101416.
53  fonts/vlgothic-fonts/vlgothic-fontconfig-gothic.conf
... ...
@@ -0,0 +1,53 @@
  1
+<?xml version="1.0"?>
  2
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
  3
+<fontconfig>
  4
+    <!-- Generic names rule -->
  5
+    <alias>
  6
+        <family>VL Gothic</family>
  7
+        <default>
  8
+            <family>monospace</family>
  9
+        </default>
  10
+    </alias>
  11
+    <!-- NOTE: just for fallback - ideally better installing vlgothic-p-fonts -->
  12
+    <alias>
  13
+        <family>VL Gothic</family>
  14
+        <default>
  15
+            <family>sans-serif</family>
  16
+        </default>
  17
+    </alias>
  18
+    <!-- Locale-specific overrides rule -->
  19
+    <match>
  20
+        <test name="lang">
  21
+            <string>ja-jp</string>
  22
+            <string>ja</string>
  23
+        </test>
  24
+        <test name="family">
  25
+            <string>monospace</string>
  26
+        </test>
  27
+        <edit name="family" mode="prepend">
  28
+            <string>VL Gothic</string>
  29
+        </edit>
  30
+    </match>
  31
+    <!-- NOTE: just for fallback - ideally better installing vlgothic-p-fonts -->
  32
+    <match>
  33
+        <test name="lang">
  34
+            <string>ja-jp</string>
  35
+            <string>ja</string>
  36
+        </test>
  37
+        <test name="family">
  38
+            <string>sans-serif</string>
  39
+        </test>
  40
+        <edit name="family" mode="prepend">
  41
+            <string>VL Gothic</string>
  42
+        </edit>
  43
+    </match>
  44
+    <!-- disabling hinting rule -->
  45
+    <match target="font">
  46
+        <test name="family">
  47
+            <string>VL Gothic</string>
  48
+        </test>
  49
+        <edit name="hinting" mode="assign">
  50
+            <bool>false</bool>
  51
+        </edit>
  52
+    </match>
  53
+</fontconfig>
33  fonts/vlgothic-fonts/vlgothic-fontconfig-pgothic.conf
... ...
@@ -0,0 +1,33 @@
  1
+<?xml version="1.0"?>
  2
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
  3
+<fontconfig>
  4
+    <!-- Generic names rule -->
  5
+    <alias>
  6
+        <family>VL PGothic</family>
  7
+        <default>
  8
+            <family>sans-serif</family>
  9
+        </default>
  10
+    </alias>
  11
+    <!-- Locale-specific overrides rule -->
  12
+    <match>
  13
+        <test name="lang">
  14
+            <string>ja-jp</string>
  15
+            <string>ja</string>
  16
+        </test>
  17
+        <test name="family">
  18
+            <string>sans-serif</string>
  19
+        </test>
  20
+        <edit name="family" mode="prepend">
  21
+            <string>VL PGothic</string>
  22
+        </edit>
  23
+    </match>
  24
+    <!-- disabling hinting rule -->
  25
+    <match target="font">
  26
+        <test name="family">
  27
+            <string>VL PGothic</string>
  28
+        </test>
  29
+        <edit name="hinting" mode="assign">
  30
+            <bool>false</bool>
  31
+        </edit>
  32
+    </match>
  33
+</fontconfig>
19  fonts/vlgothic-fonts/vlgothic-fonts.SlackBuild
@@ -41,8 +41,8 @@ PNAME=VLGothic
41 41
 NAME=vlgothic-fonts
42 42
 PKG=${PKG:-${TMP}/package-${NAME}}
43 43
 
44  
-VERSION=${VERSION:-20100416}
45  
-DL_ID=${DL_ID:-46966}
  44
+VERSION=${VERSION:-20100818}
  45
+DL_ID=${DL_ID:-48642}
46 46
 ARCH=noarch
47 47
 BUILD=${BUILD:-1}
48 48
 DOCDIR=${PKG}/usr/doc/${NAME}-${VERSION}
@@ -81,10 +81,15 @@ cd ${SRCDIR} || exit 1
81 81
 chmod -R u+w,go+r-w,a-s .
82 82
 
83 83
 mkdir -p ${PKG}/etc/fonts/conf.avail ${PKG}/etc/fonts/conf.d
84  
-for conf in 59-${PNAME}-proportional.conf 59-${PNAME}-monospace.conf ;do
85  
-  zcat ${CWD}/${conf}.gz > ${PKG}/etc/fonts/conf.avail/${conf}
86  
-  ( cd ${PKG}/etc/fonts/conf.d ; ln -sf ../conf.avail/${conf} . ) || exit 1
87  
-done
  84
+install -pm0644 ${CWD}/vlgothic-fontconfig-gothic.conf \
  85
+  ${PKG}/etc/fonts/conf.avail/65-1-vlgothic-gothic.conf || exit 1
  86
+install -pm0644 ${CWD}/vlgothic-fontconfig-pgothic.conf \
  87
+  ${PKG}/etc/fonts/conf.avail/65-0-vlgothic-pgothic.conf || exit 1
  88
+( cd ${PKG}/etc/fonts/conf.d
  89
+  for conf in *.conf ;do
  90
+    ln -sf ../conf.avail/${conf} . || exit 1
  91
+  done
  92
+) || exit 1
88 93
 
89 94
 install -m0644 *.ttf ${PKG}/${TTFDIR}/ || exit 1
90 95
 
@@ -125,7 +130,7 @@ if [ "${SB_REP}" = "YES" ] ;then
125 130
   # Replicate slackbuild and patches
126 131
   mkdir -p ${SBDIR}
127 132
   install -m0644 ${CWD}/slack-desc ${CWD}/slack-required ${CWD}/ChangeLog.SB \
128  
-                ${CWD}/*${PNAME}*.conf.gz ${SBDIR}/
  133
+                ${CWD}/*fontconfig*.conf ${SBDIR}/
129 134
   install -m0755 ${CWD}/${NAME}.SlackBuild \
130 135
                  ${SBDIR}/${NAME}.SlackBuild
131 136
 fi
4  fotoxx/ChangeLog.SB
... ...
@@ -1,3 +1,7 @@
  1
+Wed Aug 18 13:21:18 BRT 2010
  2
+fotoxx-10.8.4-x86_64-1xinc.tgz:
  3
+Updated to 10.8.4.
  4
++--------------------------+
1 5
 Fri Jul  9 12:37:03 BRT 2010
2 6
 fotoxx-10.7-x86_64-1xinc.tgz:
3 7
 Updated to 10.7.
2  fotoxx/fotoxx.SlackBuild
@@ -43,7 +43,7 @@ fi
43 43
 NAME=fotoxx
44 44
 PKG=${PKG:-${TMP}/package-${NAME}}
45 45
 
46  
-VERSION=${VERSION:-10.7}
  46
+VERSION=${VERSION:-10.8.4}
47 47
 if [ "${SB_NATIVE}" = "YES" ] ;then
48 48
   ARCH=${ARCH:-$(uname -m)}
49 49
 else
4  glibc/ChangeLog.SB
... ...
@@ -1,3 +1,7 @@
  1
+Fri Aug 20 03:06:12 BRT 2010
  2
+glibc-2.12.1-x86_64-2xinc.tgz:
  3
+Rebuilt.
  4
++--------------------------+
1 5
 Wed Aug 11 03:35:52 BRT 2010
2 6
 glibc-2.12.1-x86_64-1xinc.tgz:
3 7
 Updated to 2.12.1.
3  glibc/apply-patches.sh
@@ -44,9 +44,12 @@ fi
44 44
 #patch -p0 --verbose -i ${SB_PATCHDIR}/0070_all_glibc-i386-x86_64-revert-clone-cfi.patch
45 45
 ( SB_PATCHDIR=patches
46 46
 
  47
+  ApplyPatch 0010_all_glibc-locale-output-quote.patch
47 48
   ApplyPatch 0020_all_glibc-tweak-rfc1918-lookup.patch
48 49
   ApplyPatch 0030_all_glibc-respect-env-CPPFLAGS.patch
49 50
   ApplyPatch 0044_all_glibc-2.10-resolv-nameserver-fallback.patch
  51
+  ApplyPatch 0055_all_glibc-2.12-static-shared-getpagesize.patch
  52
+  ApplyPatch 0060_all_glibc-2.12-sse4-x86-static-strspn.patch
50 53
   patch -p0 --verbose -i ${SB_PATCHDIR}/0085_all_glibc-disable-ldconfig.patch
51 54
   ApplyPatch 1010_all_glibc-queue-header-updates.patch
52 55
   ApplyPatch 1020_all_glibc-longjmp-chk-hidden-fortify.patch
4  glibc/glibc.SlackBuild
@@ -52,7 +52,7 @@ NAME32=glibc-compat32
52 52
 VERSION=${VERSION:-2.12.1}
53 53
 # Set to 0 to enable release instead snapshot
54 54
 CHECKOUT=${CHECKOUT:-0}
55  
-PVER=${PVER:-2.12.1-1}
  55
+PVER=${PVER:-2.12.1-2}
56 56
 
57 57
 # NOTE!!!  glibc needs to be built against the sanitized kernel headers,
58 58
 # which will be installed under /usr/include by the kernel-headers package.
@@ -85,7 +85,7 @@ fi
85 85
 
86 86
 SLKDTARGET=${SLKDTARGET:-slackware}
87 87
 
88  
-BUILD=${BUILD:-1}
  88
+BUILD=${BUILD:-2}
89 89
 
90 90
 NJOBS=${NJOBS:-$(( $(getconf _NPROCESSORS_ONLN) + 1 ))}
91 91
 
4  gnome/epiphany-extensions/ChangeLog.SB
... ...
@@ -1,3 +1,7 @@
  1
+Thu Aug 19 11:39:43 BRT 2010
  2
+epiphany-extensions-2.30.2-x86_64-1xinc.tgz:
  3
+Updated to 2.30.2.
  4
++--------------------------+
1 5
 Wed May 12 16:27:03 BRT 2010
2 6
 epiphany-extensions-2.30.1-x86_64-1xinc.tgz:
3 7
 Updated to 2.30.1.
9  gnome/epiphany-extensions/epiphany-extensions.SlackBuild
@@ -43,7 +43,7 @@ fi
43 43
 NAME=epiphany-extensions
44 44
 PKG=${PKG:-${TMP}/package-${NAME}}
45 45
 
46  
-VERSION=${VERSION:-2.30.1}
  46
+VERSION=${VERSION:-2.30.2}
47 47
 SVER=$(echo ${VERSION} | cut -d . -f1-2)
48 48
 if [ "${SB_NATIVE}" = "YES" ] ;then
49 49
   ARCH=${ARCH:-$(uname -m)}
@@ -68,15 +68,18 @@ DATE=$(LC_ALL=C date +%d-%b-%Y)
68 68
 
69 69
 SRCDIR=${NAME}-${VERSION}
70 70
 SRCARCHIVE=${SRCDIR}.tar.bz2
  71
+SSRCARCHIVE=${SRCDIR}.sha256sum
71 72
 
72 73
 DL_PROG=${DL_PROG:-wget}
73 74
 DL_TO=${DL_TO:-5}
74 75
 DL_OPTS=${DL_OPTS:-"--timeout=${DL_TO}"}
75 76
 GNOME_MIRROR=${GNOME_MIRROR:-http://ftp.gnome.org/pub/GNOME/sources}
76  
-DL_URL="${GNOME_MIRROR}/${NAME}/${SVER}/${SRCARCHIVE}"
  77
+DL_URL="${GNOME_MIRROR}/${NAME}/${SVER}"
77 78
 
78 79
 # if source is not present, download in source rootdir if possible
79  
-test -r ${CWD}/${SRCARCHIVE} || ${DL_PROG} ${DL_OPTS} ${DL_URL} || exit 1
  80
+for file in ${SRCARCHIVE} ${SSRCARCHIVE} ;do
  81
+  test -r ${CWD}/${file} || ${DL_PROG} ${DL_OPTS} ${DL_URL}/${file} || exit 1
  82
+done
80 83
 
81 84
 if [ "${SB_NATIVE}" = "YES" ] ;then
82 85
   SLKCFLAGS="-O2 -march=native -mtune=native ${SB_ECFLAGS} -pipe"
4  gnome/rhythmbox/ChangeLog.SB
... ...
@@ -1,3 +1,7 @@
  1
+Thu Aug 19 23:15:33 BRT 2010
  2
+rhythmbox-0.12.8-x86_64-2xinc.tgz:
  3
+Rebuilt.
  4
++--------------------------+
1 5
 Sun Mar 28 15:31:15 BRT 2010
2 6
 rhythmbox-0.12.8-x86_64-1xinc.tgz:
3 7
 Updated to 0.12.8.
13  gnome/rhythmbox/apply-patches.sh
... ...
@@ -1,2 +1,15 @@
1 1
 
  2
+set -e -o pipefail
  3
+
2 4
 SB_PATCHDIR=${CWD}/patches
  5
+
  6
+# patch -p0 -E --backup --verbose -i ${SB_PATCHDIR}/${NAME}.patch
  7
+# https://bugzilla.gnome.org/show_bug.cgi?id=596615
  8
+patch -p1 -E --backup --verbose -i ${SB_PATCHDIR}/rb-no-HEAD-for-podcasts.patch
  9
+# https://bugzilla.gnome.org/show_bug.cgi?id=613606
  10
+patch -p1 -E --backup --verbose -i ${SB_PATCHDIR}/0001-Don-t-load-AFC-devices-using-the-MTP-plugin.patch
  11
+# From Gentoo
  12
+patch -p1 -E --backup --verbose -i ${SB_PATCHDIR}/${NAME}-0.12.8-namespace-conflict.patch
  13
+patch -p1 -E --backup --verbose -i ${SB_PATCHDIR}/${NAME}-0.12-python-initialization.patch
  14
+
  15
+set +e +o pipefail
32  gnome/rhythmbox/patches/0001-Don-t-load-AFC-devices-using-the-MTP-plugin.patch
... ...
@@ -0,0 +1,32 @@
  1
+From d5ca371eb5b7ebf9f008fec7d905f53b9f4e16c3 Mon Sep 17 00:00:00 2001
  2
+From: Bastien Nocera <hadess@hadess.net>
  3
+Date: Mon, 22 Mar 2010 16:42:10 +0000
  4
+Subject: [PATCH] Don't load AFC devices using the MTP plugin
  5
+
  6
+They should be handled by the iPod plugin instead.
  7
+
  8
+https://bugzilla.gnome.org/show_bug.cgi?id=613606
  9
+---
  10
+ plugins/mtpdevice/rb-mtp-plugin.c |    6 ++++++
  11
+ 1 files changed, 6 insertions(+), 0 deletions(-)
  12
+
  13
+diff --git a/plugins/mtpdevice/rb-mtp-plugin.c b/plugins/mtpdevice/rb-mtp-plugin.c
  14
+index fdb9df8..43a4b15 100644
  15
+--- a/plugins/mtpdevice/rb-mtp-plugin.c
  16
++++ b/plugins/mtpdevice/rb-mtp-plugin.c
  17
+@@ -343,6 +343,12 @@ create_source_device_cb (RBRemovableMediaManager *rmm, GObject *device_obj, RBMt
  18
+ 		return NULL;
  19
+ 	}
  20
+ 
  21
++	/* check that it's not an iPhone or iPod Touch */
  22
++	if (g_udev_device_get_property_as_boolean (device, "USBMUX_SUPPORTED")) {
  23
++		rb_debug ("device %s is supported through AFC, ignore", g_udev_device_get_name (device));
  24
++		return NULL;
  25
++	}
  26
++
  27
+ 	device_number = g_udev_device_get_device_number (device);
  28
+ 	if (device_number == 0) {
  29
+ 		rb_debug ("can't get udev device number for device %s", g_udev_device_get_name (device));
  30
+-- 
  31
+1.7.0.1
  32
+
261  gnome/rhythmbox/patches/rb-no-HEAD-for-podcasts.patch
... ...
@@ -0,0 +1,261 @@
  1
+diff -up rhythmbox-0.12.8/podcast/rb-podcast-manager.c.http-head rhythmbox-0.12.8/podcast/rb-podcast-manager.c
  2
+--- rhythmbox-0.12.8/podcast/rb-podcast-manager.c.http-head	2010-03-24 20:10:14.000000000 -0400
  3
++++ rhythmbox-0.12.8/podcast/rb-podcast-manager.c	2010-03-29 09:44:56.706660001 -0400
  4
+@@ -148,9 +148,14 @@ static void rb_podcast_manager_get_prope
  5
+ 							 guint prop_id,
  6
+ 		                                	 GValue *value,
  7
+                 		                	 GParamSpec *pspec);
  8
++static void read_file_cb					(GFile *source,
  9
++							 GAsyncResult *result,
  10
++							 RBPodcastManagerInfo *data);
  11
+ static void download_file_info_cb			(GFile *source,
  12
+ 							 GAsyncResult *result,
  13
+ 							 RBPodcastManagerInfo *data);
  14
++static void download_podcast				(GFileInfo *src_info,
  15
++							 RBPodcastManagerInfo *data);
  16
+ static void rb_podcast_manager_abort_download		(RBPodcastManagerInfo *data);
  17
+ static gboolean rb_podcast_manager_sync_head_cb 	(gpointer data);
  18
+ static gboolean rb_podcast_manager_head_query_cb 	(GtkTreeModel *query_model,
  19
+@@ -594,7 +599,7 @@ rb_podcast_manager_head_query_cb (GtkTre
  20
+ }
  21
+ 
  22
+ static void
  23
+-download_error (RBPodcastManagerInfo *data, GError *error)
  24
++download_error (RBPodcastManagerInfo *data, GError *error, gboolean in_thread)
  25
+ {
  26
+ 	GValue val = {0,};
  27
+ 
  28
+@@ -617,7 +622,11 @@ download_error (RBPodcastManagerInfo *da
  29
+ 	}
  30
+ 
  31
+ 	rhythmdb_commit (data->pd->priv->db);
  32
+-	g_idle_add ((GSourceFunc)end_job, data);
  33
++	if (in_thread) {
  34
++		g_idle_add ((GSourceFunc)end_job, data);
  35
++	} else {
  36
++		rb_podcast_manager_abort_download (data);
  37
++	}
  38
+ }
  39
+ 
  40
+ static gboolean
  41
+@@ -626,7 +635,6 @@ rb_podcast_manager_next_file (RBPodcastM
  42
+ 	const char *location;
  43
+ 	RBPodcastManagerInfo *data;
  44
+ 	char *query_string;
  45
+-	const char *attrs;
  46
+ 	GList *d;
  47
+ 
  48
+ 	g_assert (rb_is_main_thread ());
  49
+@@ -670,69 +678,103 @@ rb_podcast_manager_next_file (RBPodcastM
  50
+ 
  51
+ 	data->source = g_file_new_for_uri (location);
  52
+ 
  53
+-	attrs = G_FILE_ATTRIBUTE_STANDARD_SIZE ","
  54
+-		G_FILE_ATTRIBUTE_STANDARD_COPY_NAME ","
  55
+-		G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME;
  56
+-	g_file_query_info_async (data->source,
  57
+-				 attrs,
  58
+-				 G_FILE_QUERY_INFO_NONE,
  59
+-				 0,
  60
+-				 data->cancel,
  61
+-				 (GAsyncReadyCallback) download_file_info_cb,
  62
+-				 data);
  63
++	g_file_read_async (data->source,
  64
++	                   0,
  65
++	                   data->cancel,
  66
++	                   (GAsyncReadyCallback) read_file_cb,
  67
++	                   data);
  68
+ 
  69
+ 	GDK_THREADS_LEAVE ();
  70
+ 	return FALSE;
  71
+ }
  72
+ 
  73
+ static void
  74
+-download_file_info_cb (GFile *source,
  75
+-		       GAsyncResult *result,
  76
+-		       RBPodcastManagerInfo *data)
  77
++read_file_cb (GFile *source,
  78
++              GAsyncResult *result,
  79
++              RBPodcastManagerInfo *data)
  80
+ {
  81
+ 	GError *error = NULL;
  82
+ 	GFileInfo *src_info;
  83
+-	char *local_file_name = NULL;
  84
+-	char *feed_folder;
  85
+-	char *esc_local_file_name;
  86
+-	char *local_file_uri;
  87
+-	char *sane_local_file_uri;
  88
+-	char *conf_dir_uri;
  89
+ 
  90
+ 	g_assert (rb_is_main_thread ());
  91
+ 
  92
+-	rb_debug ("got file info results for %s",
  93
++	rb_debug ("started read for %s",
  94
+ 		  get_remote_location (data->entry));
  95
+ 
  96
+-	src_info = g_file_query_info_finish (source, result, &error);
  97
+-
  98
+-	/* ignore G_IO_ERROR_FAILED here, as it probably just means that the server is lame.
  99
+-	 * actual problems (not found, permission denied, etc.) have specific errors codes,
  100
+-	 * so they'll still be reported.
  101
++	data->in_stream = g_file_read_finish (data->source,
  102
++	                                      result,
  103
++	                                      &error);
  104
++	if (error != NULL) {
  105
++		download_error (data, error, FALSE);
  106
++		g_error_free (error);
  107
++		return;
  108
++	}
  109
++    
  110
++	src_info = g_file_input_stream_query_info (data->in_stream,
  111
++	                                           G_FILE_ATTRIBUTE_STANDARD_SIZE ","
  112
++	                                           G_FILE_ATTRIBUTE_STANDARD_COPY_NAME ","
  113
++	                                           G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME,
  114
++	                                           NULL,
  115
++	                                           &error);
  116
++
  117
++	/* If no stream information then probably using an old version of gvfs, fall back
  118
++	 * to getting the stream information from the GFile.
  119
++	 * This branch can be removed when this version of gvfs is released, see:
  120
++	 * https://bugzilla.gnome.org/show_bug.cgi?id=598505
  121
+ 	 */
  122
+-	if (error != NULL && g_error_matches (error, G_IO_ERROR, G_IO_ERROR_FAILED) == FALSE) {
  123
+-		GValue val = {0,};
  124
++	if (error != NULL) {
  125
++		rb_debug ("file info query from input failed, trying query on file: %s", error->message);
  126
++		g_error_free (error);
  127
+ 
  128
+-		rb_debug ("file info query failed: %s", error->message);
  129
++		g_file_query_info_async (data->source,
  130
++		                         G_FILE_ATTRIBUTE_STANDARD_SIZE ","
  131
++		                         G_FILE_ATTRIBUTE_STANDARD_COPY_NAME ","
  132
++		                         G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME,
  133
++		                         G_FILE_QUERY_INFO_NONE,
  134
++		                         0,
  135
++		                         data->cancel,
  136
++		                         (GAsyncReadyCallback) download_file_info_cb,
  137
++		                         data);
  138
++		return;
  139
++	}
  140
+ 
  141
+-		g_value_init (&val, G_TYPE_ULONG);
  142
+-		g_value_set_ulong (&val, RHYTHMDB_PODCAST_STATUS_ERROR);
  143
+-		rhythmdb_entry_set (data->pd->priv->db, data->entry, RHYTHMDB_PROP_STATUS, &val);
  144
+-		g_value_unset (&val);
  145
++	rb_debug ("got file info results for %s",
  146
++		  get_remote_location (data->entry));
  147
+ 
  148
+-		g_value_init (&val, G_TYPE_STRING);
  149
+-		g_value_set_string (&val, error->message);
  150
+-		rhythmdb_entry_set (data->pd->priv->db, data->entry, RHYTHMDB_PROP_PLAYBACK_ERROR, &val);
  151
+-		g_value_unset (&val);
  152
++	download_podcast (src_info, data);
  153
++}
  154
+ 
  155
+-		rhythmdb_commit (data->pd->priv->db);
  156
++static void
  157
++download_file_info_cb (GFile *source,
  158
++                       GAsyncResult *result,
  159
++                       RBPodcastManagerInfo *data)
  160
++{
  161
++	GError *error = NULL;
  162
++	GFileInfo *src_info;
  163
+ 
  164
++	src_info = g_file_query_info_finish (source, result, &error);
  165
++
  166
++	if (error != NULL) {
  167
++		download_error (data, error, FALSE);
  168
+ 		g_error_free (error);
  169
+-		rb_podcast_manager_abort_download (data);
  170
+-		return;
  171
+ 	} else {
  172
+-		g_clear_error (&error);
  173
++		rb_debug ("got file info results for %s",
  174
++			  get_remote_location (data->entry));
  175
++
  176
++		download_podcast (src_info, data);
  177
+ 	}
  178
++}
  179
++
  180
++static void
  181
++download_podcast (GFileInfo *src_info, RBPodcastManagerInfo *data)
  182
++{
  183
++	GError *error = NULL;
  184
++	char *local_file_name = NULL;
  185
++	char *feed_folder;
  186
++	char *esc_local_file_name;
  187
++	char *local_file_uri;
  188
++	char *sane_local_file_uri;
  189
++	char *conf_dir_uri;
  190
+ 
  191
+ 	if (src_info != NULL) {
  192
+ 		data->download_size = g_file_info_get_attribute_uint64 (src_info, G_FILE_ATTRIBUTE_STANDARD_SIZE);
  193
+@@ -750,7 +792,7 @@ download_file_info_cb (GFile *source,
  194
+ 
  195
+ 	if (local_file_name == NULL) {
  196
+ 		/* fall back to the basename from the original URI */
  197
+-		local_file_name = g_file_get_basename (source);
  198
++		local_file_name = g_file_get_basename (data->source);
  199
+ 		rb_debug ("didn't get a filename from the file info request; using basename %s", local_file_name);
  200
+ 	}
  201
+ 
  202
+@@ -800,7 +842,6 @@ download_file_info_cb (GFile *source,
  203
+ 		return;
  204
+ 	}
  205
+ 
  206
+-
  207
+ 	data->destination = g_file_new_for_uri (sane_local_file_uri);
  208
+ 	if (g_file_query_exists (data->destination, NULL)) {
  209
+ 		GFileInfo *dest_info;
  210
+@@ -873,7 +914,7 @@ download_file_info_cb (GFile *source,
  211
+ 					TRUE,
  212
+ 					&error);
  213
+ 	if (error != NULL) {
  214
+-		download_error (data, error);
  215
++		download_error (data, error, TRUE);
  216
+ 		g_error_free (error);
  217
+ 	}
  218
+ }
  219
+@@ -1415,14 +1456,6 @@ podcast_download_thread (RBPodcastManage
  220
+ 	gssize n_read;
  221
+ 	gssize n_written;
  222
+ 	guint64 downloaded;
  223
+-	
  224
+-	/* open remote file */
  225
+-	data->in_stream = g_file_read (data->source, data->cancel, &error);
  226
+-	if (error != NULL) {
  227
+-		download_error (data, error);
  228
+-		g_error_free (error);
  229
+-		return NULL;
  230
+-	}
  231
+ 
  232
+ 	/* if we have an offset to download from, try the seek
  233
+ 	 * before anything else.  if we can't seek, we'll have to
  234
+@@ -1451,7 +1484,7 @@ podcast_download_thread (RBPodcastManage
  235
+ 		}
  236
+ 	}
  237
+ 	if (error != NULL) {
  238
+-		download_error (data, error);
  239
++		download_error (data, error, TRUE);
  240
+ 		g_error_free (error);
  241
+ 		return NULL;
  242
+ 	}
  243
+@@ -1500,7 +1533,7 @@ podcast_download_thread (RBPodcastManage
  244
+ 						  data->cancel,
  245
+ 						  &error);
  246
+ 		if (error != NULL) {
  247
+-			download_error (data, error);
  248
++			download_error (data, error, TRUE);
  249
+ 			g_error_free (error);
  250
+ 			return NULL;
  251
+ 		}
  252
+@@ -1544,7 +1577,8 @@ podcast_download_thread (RBPodcastManage
  253
+ 	g_object_unref (data->out_stream);
  254
+ 
  255
+ 	if (error != NULL) {
  256
+-		download_error (data, error);
  257
++		download_error (data, error, TRUE);
  258
++		g_error_free (error);
  259
+ 	} else {
  260
+ 		download_progress (data, downloaded, data->download_size, TRUE);
  261
+ 	}
171  gnome/rhythmbox/patches/rhythmbox-0.12-python-initialization.patch
... ...
@@ -0,0 +1,171 @@
  1
+From 4394826f36fad0ad36ea773b6d4525dfcfcd389b Mon Sep 17 00:00:00 2001
  2
+From: Jonathan Matthew <jonathan@d14n.org>
  3
+Date: Wed, 05 May 2010 12:58:26 +0000
  4
+Subject: python: fix a number of python initialization problems (bug #617587)
  5
+
  6
+- pygtk.require("2.8") doesn't work - it's only after a major version,
  7
+  so we should pass in "2.0" instead
  8
+- init_pygobject() is deprecated, use pygobject_init (and pass in the
  9
+  version we require) instead
  10
+- init_pygtk() is a macro that returns from the current function on
  11
+  error, so we need to call it from a separate function for our error
  12
+  handling to work
  13
+- if some aspect of python initialization failed, we were still using
  14
+  the pygobject GIL macros, which were crashing
  15
+---
  16
+diff --git a/shell/main.c b/shell/main.c
  17
+index 1f27fee..a4dd50a 100644
  18
+--- a/shell/main.c
  19
++++ b/shell/main.c
  20
+@@ -35,6 +35,7 @@
  21
+ #define NO_IMPORT_PYGOBJECT
  22
+ #define NO_IMPORT_PYGTK
  23
+ #include <pygobject.h>
  24
++#include "rb-python-module.h"
  25
+ 
  26
+ /* make sure it's defined somehow */
  27
+ #ifndef _XOPEN_SOURCE
  28
+@@ -327,11 +328,15 @@ main (int argc, char **argv)
  29
+ 
  30
+ 		rb_profile_start ("mainloop");
  31
+ #ifdef ENABLE_PYTHON
  32
+-		pyg_begin_allow_threads;
  33
+-#endif
  34
++		if (rb_python_init_successful ()) {
  35
++			pyg_begin_allow_threads;
  36
++			gtk_main ();
  37
++			pyg_end_allow_threads;
  38
++		} else {
  39
++			gtk_main ();
  40
++		}
  41
++#else
  42
+ 		gtk_main ();
  43
+-#ifdef ENABLE_PYTHON
  44
+-		pyg_end_allow_threads;
  45
+ #endif
  46
+ 		rb_profile_end ("mainloop");
  47
+ 
  48
+diff --git a/shell/rb-python-module.c b/shell/rb-python-module.c
  49
+index 9e14731..1995a42 100644
  50
+--- a/shell/rb-python-module.c
  51
++++ b/shell/rb-python-module.c
  52
+@@ -84,8 +84,16 @@ extern PyMethodDef pyrb_functions[];
  53
+ /* We retreive this to check for correct class hierarchy */
  54
+ static PyTypeObject *PyRBPlugin_Type;
  55
+ 
  56
++static gboolean python_init_successful;
  57
++
  58
+ G_DEFINE_TYPE (RBPythonModule, rb_python_module, G_TYPE_TYPE_MODULE);
  59
+ 
  60
++static void
  61
++actually_init_pygtk (void)
  62
++{
  63
++	init_pygtk ();
  64
++}
  65
++
  66
+ void
  67
+ rb_python_module_init_python (void)
  68
+ {
  69
+@@ -98,6 +106,7 @@ rb_python_module_init_python (void)
  70
+ 	char *argv[] = { "rb", "rhythmdb", NULL };
  71
+ 	GList *paths;
  72
+ 
  73
++	python_init_successful = FALSE;
  74
+ 	if (Py_IsInitialized ()) {
  75
+ 		g_warning ("Python Should only be initialized once, since it's in class_init");
  76
+ 		g_return_if_reached ();
  77
+@@ -130,7 +139,7 @@ rb_python_module_init_python (void)
  78
+ 
  79
+ 	PySys_SetArgv (1, argv);
  80
+ 
  81
+-	/* pygtk.require("2.8") */
  82
++	/* pygtk.require("2.0") */
  83
+ 	pygtk = PyImport_ImportModule ("pygtk");
  84
+ 	if (pygtk == NULL) {
  85
+ 		g_warning ("Could not import pygtk");
  86
+@@ -140,11 +149,15 @@ rb_python_module_init_python (void)
  87
+ 
  88
+ 	mdict = PyModule_GetDict (pygtk);
  89
+ 	require = PyDict_GetItemString (mdict, "require");
  90
+-	PyObject_CallObject (require, Py_BuildValue ("(S)", PyString_FromString ("2.8")));
  91
++	PyObject_CallObject (require, Py_BuildValue ("(S)", PyString_FromString ("2.0")));
  92
++	if (PyErr_Occurred ()) {
  93
++		g_warning ("pygtk.require(2.0) failed");
  94
++		PyErr_Print();
  95
++		return;
  96
++	}
  97
+ 
  98
+ 	/* import gobject */
  99
+-	init_pygobject ();
  100
+-	if (PyErr_Occurred ()) {
  101
++	if (pygobject_init (2, 16, 0) == NULL) {
  102
+ 		g_warning ("Could not initialize pygobject");
  103
+ 		PyErr_Print();
  104
+ 		return;
  105
+@@ -154,7 +167,7 @@ rb_python_module_init_python (void)
  106
+ 	pyg_disable_warning_redirections ();
  107
+ 
  108
+ 	/* import gtk */
  109
+-	init_pygtk ();
  110
++	actually_init_pygtk ();
  111
+ 	if (PyErr_Occurred ()) {
  112
+ 		g_warning ("Could not initialize pygtk");
  113
+ 		PyErr_Print();
  114
+@@ -172,7 +185,7 @@ rb_python_module_init_python (void)
  115
+ 
  116
+ 	mdict = PyModule_GetDict (gtk);
  117
+ 	pygtk_version = PyDict_GetItemString (mdict, "pygtk_version");
  118
+-	pygtk_required_version = Py_BuildValue ("(iii)", 2, 4, 0);
  119
++	pygtk_required_version = Py_BuildValue ("(iii)", 2, 8, 0);
  120
+ 	if (PyObject_Compare (pygtk_version, pygtk_required_version) == -1) {
  121
+ 		g_warning("PyGTK %s required, but %s found.",
  122
+ 				  PyString_AsString (PyObject_Repr (pygtk_required_version)),
  123
+@@ -264,6 +277,8 @@ rb_python_module_init_python (void)
  124
+ 	gettext_args = Py_BuildValue ("ss", GETTEXT_PACKAGE, GNOMELOCALEDIR);
  125
+ 	PyObject_CallObject (install, gettext_args);
  126
+ 	Py_DECREF (gettext_args);
  127
++
  128
++	python_init_successful = TRUE;
  129
+ }
  130
+ 
  131
+ static gboolean
  132
+@@ -329,6 +344,11 @@ rb_python_module_load_with_gil (GTypeModule *module)
  133
+ 	PyGILState_STATE state;
  134
+ 	gboolean ret;
  135
+ 
  136
++	if (python_init_successful == FALSE) {
  137
++		g_warning ("unable to load module as python runtime could not be initialized");
  138
++		return FALSE;
  139
++	}
  140
++
  141
+ 	state = pyg_gil_state_ensure ();
  142
+ 	ret = rb_python_module_load (module);
  143
+ 	pyg_gil_state_release (state);
  144
+@@ -485,6 +505,12 @@ rb_python_module_new (const gchar *path,
  145
+ 	return result;
  146
+ }
  147
+ 
  148
++gboolean
  149
++rb_python_init_successful (void)
  150
++{
  151
++	return python_init_successful;
  152
++}
  153
++
  154
+ /* --- these are not module methods, they are here out of convenience --- */
  155
+ 
  156
+ #if 0
  157
+diff --git a/shell/rb-python-module.h b/shell/rb-python-module.h
  158
+index 5b2c152..30c1200 100644
  159
+--- a/shell/rb-python-module.h
  160
++++ b/shell/rb-python-module.h
  161
+@@ -60,6 +60,8 @@ GObject			*rb_python_module_new_object		(RBPythonModule *module);
  162
+ 
  163
+ void			rb_python_module_init_python		(void);
  164
+ 
  165
++gboolean		rb_python_init_successful		(void);
  166
++
  167
+ void			rb_python_garbage_collect		(void);
  168
+ 
  169
+ void			rb_python_shutdown			(void);
  170
+--
  171
+cgit v0.8.3.1
48  gnome/rhythmbox/patches/rhythmbox-0.12.8-namespace-conflict.patch
... ...
@@ -0,0 +1,48 @@
  1
+From bd389d8e8a2b1f3a914dcd4bb17e75fb8837d78a Mon Sep 17 00:00:00 2001
  2
+From: Jonathan Matthew <jonathan@d14n.org>
  3
+Date: Tue, 01 Jun 2010 00:55:27 +0000
  4
+Subject: rb-client: rename 'pause' to avoid conflict with pause(2) (bug #620199)
  5
+
  6
+---
  7
+diff --git a/remote/dbus/rb-client.c b/remote/dbus/rb-client.c
  8
+index 648dd2f..5bb34a2 100644
  9
+--- a/remote/dbus/rb-client.c
  10
++++ b/remote/dbus/rb-client.c
  11
+@@ -54,7 +54,7 @@ static gboolean previous = FALSE;
  12
+ static gboolean notify = FALSE;
  13
+ 
  14
+ static gboolean play = FALSE;
  15
+-static gboolean pause = FALSE;
  16
++static gboolean do_pause = FALSE;
  17
+ static gboolean play_pause = FALSE;
  18
+ static gboolean stop = FALSE;
  19
+ 
  20
+@@ -91,7 +91,7 @@ static GOptionEntry args[] = {
  21
+ 	{ "notify", 0, 0, G_OPTION_ARG_NONE, &notify, N_("Show notification of the playing song"), NULL },
  22
+ 
  23
+ 	{ "play", 0, 0, G_OPTION_ARG_NONE, &play, N_("Resume playback if currently paused"), NULL },
  24
+-	{ "pause", 0, 0, G_OPTION_ARG_NONE, &pause, N_("Pause playback if currently playing"), NULL },
  25
++	{ "pause", 0, 0, G_OPTION_ARG_NONE, &do_pause, N_("Pause playback if currently playing"), NULL },
  26
+ 	{ "play-pause", 0, 0, G_OPTION_ARG_NONE, &play_pause, N_("Toggle play/pause mode"), NULL },
  27
+ /*	{ "stop", 0, 0, G_OPTION_ARG_NONE, &stop, N_("Stop playback"), NULL }, */
  28
+ 
  29
+@@ -608,7 +608,7 @@ main (int argc, char **argv)
  30
+ 	if (next || previous ||
  31
+ 	    clear_queue ||
  32
+ 	    play_uri || other_stuff ||
  33
+-	    play || pause || play_pause || stop ||
  34
++	    play || do_pause || play_pause || stop ||
  35
+ 	    print_playing || print_playing_format || notify ||
  36
+ 	    (set_volume > -0.01) || volume_up || volume_down || print_volume || mute || unmute || (set_rating > -0.01))
  37
+ 		no_present = TRUE;
  38
+@@ -696,7 +696,7 @@ main (int argc, char **argv)
  39
+ 	org_gnome_Rhythmbox_Player_get_playing (player_proxy, &is_playing, &error);
  40
+ 	if (!annoy (&error)) {
  41
+ 		rb_debug ("playback state: %d", is_playing);
  42
+-		if (play || pause || play_pause) {
  43
++		if (play || do_pause || play_pause) {
  44
+ 			if (is_playing != play || play_pause) {
  45
+ 				rb_debug ("calling playPause to change playback state");
  46
+ 				org_gnome_Rhythmbox_Player_play_pause (player_proxy, FALSE, &error);
  47
+--