diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-05 11:13:43 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-05 11:13:43 -0300 |
| commit | 58d6937e71aea203f6693a68146018f950922fbc (patch) | |
| tree | 3b53b76f930f60717debca5e0d612eeab0279b39 /extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.0.0-underlink.patch | |
| parent | d07d53d7af1e9694d9558783841bc2df3124a90f (diff) | |
| parent | f651180e6b1ac9508ec0d1d9b94972de776020a9 (diff) | |
I don't understand gcc/PKGBUILD.mips64el
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/addresses/PKGBUILD
community/chmsee/PKGBUILD
community/coin/PKGBUILD
community/critterding/PKGBUILD
community/distcc/PKGBUILD
community/djview4/PKGBUILD
community/freedroid/PKGBUILD
community/gnumail/PKGBUILD
community/gyachi/PKGBUILD
community/java-oracle/PKGBUILD
community/liboop/PKGBUILD
community/ltris/PKGBUILD
community/nepim/PKGBUILD
community/pantomime/PKGBUILD
community/pyxattr/PKGBUILD
community/soqt/PKGBUILD
community/tilda/PKGBUILD
community/unrealircd/PKGBUILD
community/uqm/PKGBUILD
core/dnsutils/PKGBUILD
core/gcc/PKGBUILD.mips64el
core/vpnc/PKGBUILD
extra/apache/PKGBUILD
extra/bind/PKGBUILD
extra/bzflag/PKGBUILD
extra/ccache/PKGBUILD
extra/claws-mail-extra-plugins/PKGBUILD
extra/clutter-gst/PKGBUILD
extra/cups/PKGBUILD
extra/doxygen/PKGBUILD
extra/fam/PKGBUILD
extra/fcitx/PKGBUILD
extra/gdk-pixbuf2/PKGBUILD
extra/geoip/PKGBUILD
extra/gtk2/PKGBUILD
extra/icedtea-web/PKGBUILD
extra/libffi/PKGBUILD
extra/libfwbuilder/PKGBUILD
extra/libmpd/PKGBUILD
extra/libreoffice/PKGBUILD
extra/mesa/PKGBUILD
extra/pygobject2/PKGBUILD
extra/qt/PKGBUILD
extra/samba/PKGBUILD
extra/wireshark/PKGBUILD
extra/xulrunner/PKGBUILD
multilib-testing/lib32-keyutils/PKGBUILD
multilib-testing/lib32-udev/PKGBUILD
multilib/lib32-gtk2/PKGBUILD
multilib/lib32-keyutils/PKGBUILD
multilib/lib32-libcups/PKGBUILD
multilib/lib32-qt/PKGBUILD
multilib/wine/PKGBUILD
multilib/wine_gecko/PKGBUILD
testing/dash/PKGBUILD
testing/libssh2/PKGBUILD
Diffstat (limited to 'extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.0.0-underlink.patch')
| -rw-r--r-- | extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.0.0-underlink.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.0.0-underlink.patch b/extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.0.0-underlink.patch deleted file mode 100644 index 2a19d1d8b..000000000 --- a/extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.0.0-underlink.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- xfce4-sensors-plugin-1.0.0/panel-plugin/Makefile.am 2011-01-14 15:40:24.065537723 +0000 -+++ xfce4-sensors-plugin-1.0.0/panel-plugin/Makefile.am.new 2011-01-14 15:41:48.248960397 +0000 -@@ -20,6 +20,7 @@ - - xfce4_sensors_plugin_CFLAGS = \ - @LIBXFCE4PANEL_CFLAGS@ \ -+ @LIBXFCEGUI4_CFLAGS@ \ - @PLATFORM_CFLAGS@ \ - -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ - @LIBSENSORS_CFLAGS@ -@@ -30,6 +31,7 @@ - xfce4_sensors_plugin_LDFLAGS = \ - $(top_builddir)/lib/libxfce4sensors.la \ - @LIBXFCE4PANEL_LIBS@ \ -+ @LIBXFCEGUI4_LIBS@ \ - @SOLLIBS@ \ - @LIBSENSORS_LDFLAGS@ \ - @LIBM@ ---- xfce4-sensors-plugin-1.0.0/src/Makefile.am 2009-11-06 11:02:11.000000000 +0000 -+++ xfce4-sensors-plugin-1.0.0/src/Makefile.am.new 2011-01-14 16:19:09.777636193 +0000 -@@ -27,6 +27,7 @@ - -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ - @LIBSENSORS_CFLAGS@ \ - @LIBXFCE4UTIL_CFLAGS@ \ -+ @LIBXFCE4PANEL_CFLAGS@ \ - @LIBXFCEGUI4_CFLAGS@ - - # @GTK_CFLAGS@ \ -@@ -41,6 +42,7 @@ - $(top_builddir)/lib/libxfce4sensors.la \ - @LIBSENSORS_LDFLAGS@ \ - @LIBXFCE4UTIL_LIBS@ \ -+ @LIBXFCE4PANEL_LIBS@ \ - @LIBXFCEGUI4_LIBS@ - - # @GTK_LIBS@ \ |