aboutsummaryrefslogtreecommitdiffstats
path: root/x11/gnome-applets/files
diff options
context:
space:
mode:
Diffstat (limited to 'x11/gnome-applets/files')
-rw-r--r--x11/gnome-applets/files/patch-aa70
-rw-r--r--x11/gnome-applets/files/patch-cpufreq-freebsd20
-rw-r--r--x11/gnome-applets/files/patch-cpufreq-selector-freebsd18
3 files changed, 42 insertions, 66 deletions
diff --git a/x11/gnome-applets/files/patch-aa b/x11/gnome-applets/files/patch-aa
index 2e1c62bde21d..7d1f860845cb 100644
--- a/x11/gnome-applets/files/patch-aa
+++ b/x11/gnome-applets/files/patch-aa
@@ -1,16 +1,15 @@
---- configure.orig Wed Jul 26 16:38:04 2006
-+++ configure Wed Jul 26 16:38:04 2006
-@@ -24860,8 +24860,7 @@
+--- configure.orig 2007-07-09 18:13:48.000000000 -0400
++++ configure 2007-07-09 18:14:19.000000000 -0400
+@@ -25117,7 +25117,7 @@ _ACEOF
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-- ac_define_dir=`eval echo $"${prefix}/share/locale"`
-- ac_define_dir=`eval echo $ac_define_dir`
-+ ac_define_dir=`eval echo "${prefix}/share/locale"`
+- ac_define_dir=`eval echo $"${datadir}/locale"`
++ ac_define_dir=`eval echo "${datadir}/locale"`
+ ac_define_dir=`eval echo $ac_define_dir`
GNOMELOCALEDIR="$ac_define_dir"
-
-@@ -27066,8 +27065,8 @@
+@@ -27157,8 +27157,8 @@ fi
;;
# list of supported OS cores that do not use libapm
@@ -21,7 +20,16 @@
ACPIINC="-I${OS_SYS}"
else
ACPIINC="-I/usr/src/sys"
-@@ -28145,6 +28144,9 @@
+@@ -27924,7 +27924,7 @@ echo "${ECHO_T}no" >&6; }
+ fi
+
+
+- stb="system-tools-backends"
++ stb="system-tools-backends-2.0"
+
+ if test x$PKG_CONFIG != xno ; then
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.12 ; then
+@@ -28166,6 +28166,9 @@ if test x$disable_cpufreq = xno; then
*linux*)
build_cpufreq_applet=yes
;;
@@ -31,82 +39,66 @@
*)
{ echo "$as_me:$LINENO: WARNING: ${host} is not supported by cpufreq applet, not building" >&5
echo "$as_me: WARNING: ${host} is not supported by cpufreq applet, not building" >&2;}
-@@ -28752,7 +28754,7 @@
- ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
-
-
--iconsdir="${datadir}/icons"
-+iconsdir="${prefix}/share/icons"
-
- pixmapsdir="${datadir}/pixmaps"
-
-@@ -28764,8 +28766,7 @@
+@@ -28684,7 +28687,7 @@ gladedir="${pkgdatadir}/glade"
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
- ac_define_dir=`eval echo $"${iconsdir}"`
-- ac_define_dir=`eval echo $ac_define_dir`
+ ac_define_dir=`eval echo "${iconsdir}"`
+ ac_define_dir=`eval echo $ac_define_dir`
GNOME_ICONDIR="$ac_define_dir"
-
-@@ -28777,8 +28778,7 @@
+@@ -28697,7 +28700,7 @@ _ACEOF
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
- ac_define_dir=`eval echo $"${pixmapsdir}"`
-- ac_define_dir=`eval echo $ac_define_dir`
+ ac_define_dir=`eval echo "${pixmapsdir}"`
+ ac_define_dir=`eval echo $ac_define_dir`
GNOME_PIXMAPSDIR="$ac_define_dir"
-
-@@ -28790,8 +28790,7 @@
+@@ -28710,7 +28713,7 @@ _ACEOF
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
- ac_define_dir=`eval echo $"${gladedir}"`
-- ac_define_dir=`eval echo $ac_define_dir`
+ ac_define_dir=`eval echo "${gladedir}"`
+ ac_define_dir=`eval echo $ac_define_dir`
GNOME_GLADEDIR="$ac_define_dir"
-
-@@ -28803,8 +28802,7 @@
+@@ -28723,7 +28726,7 @@ _ACEOF
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
- ac_define_dir=`eval echo $"${datadir}"`
-- ac_define_dir=`eval echo $ac_define_dir`
+ ac_define_dir=`eval echo "${datadir}"`
+ ac_define_dir=`eval echo $ac_define_dir`
DATADIR="$ac_define_dir"
-
-@@ -28816,8 +28814,7 @@
+@@ -28736,7 +28739,7 @@ _ACEOF
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
- ac_define_dir=`eval echo $"${sysconfdir}"`
-- ac_define_dir=`eval echo $ac_define_dir`
+ ac_define_dir=`eval echo "${sysconfdir}"`
+ ac_define_dir=`eval echo $ac_define_dir`
SYSCONFDIR="$ac_define_dir"
-
-@@ -28829,8 +28826,7 @@
+@@ -28749,7 +28752,7 @@ _ACEOF
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
- ac_define_dir=`eval echo $"${libdir}"`
-- ac_define_dir=`eval echo $ac_define_dir`
+ ac_define_dir=`eval echo "${libdir}"`
+ ac_define_dir=`eval echo $ac_define_dir`
LIBDIR="$ac_define_dir"
-
-@@ -28842,8 +28838,7 @@
+@@ -28762,7 +28765,7 @@ _ACEOF
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
- ac_define_dir=`eval echo $"$prefix"`
-- ac_define_dir=`eval echo $ac_define_dir`
+ ac_define_dir=`eval echo "$prefix"`
+ ac_define_dir=`eval echo $ac_define_dir`
PREFIX="$ac_define_dir"
-
diff --git a/x11/gnome-applets/files/patch-cpufreq-freebsd b/x11/gnome-applets/files/patch-cpufreq-freebsd
index 5c7f4dfa71d6..a597e6725bd0 100644
--- a/x11/gnome-applets/files/patch-cpufreq-freebsd
+++ b/x11/gnome-applets/files/patch-cpufreq-freebsd
@@ -396,9 +396,9 @@
+ return list;
+}
+#endif /* __FreeBSD__ */
---- cpufreq/src/Makefile.in.orig Mon Mar 12 11:58:09 2007
-+++ cpufreq/src/Makefile.in Mon Mar 12 12:12:06 2007
-@@ -62,7 +62,8 @@ am__cpufreq_applet_SOURCES_DIST = cpufre
+--- cpufreq/src/Makefile.in.orig 2007-07-30 21:06:58.000000000 -0400
++++ cpufreq/src/Makefile.in 2007-07-30 21:06:58.000000000 -0400
+@@ -61,7 +61,8 @@ am__cpufreq_applet_SOURCES_DIST = cpufre
cpufreq-monitor-procfs.h cpufreq-monitor-sysfs.c \
cpufreq-monitor-sysfs.h cpufreq-monitor-libcpufreq.c \
cpufreq-monitor-libcpufreq.h cpufreq-monitor-cpuinfo.c \
@@ -408,7 +408,7 @@
@HAVE_LIBCPUFREQ_TRUE@am__objects_1 = \
@HAVE_LIBCPUFREQ_TRUE@ cpufreq-monitor-libcpufreq.$(OBJEXT)
am_cpufreq_applet_OBJECTS = cpufreq-applet.$(OBJEXT) \
-@@ -71,7 +72,8 @@ am_cpufreq_applet_OBJECTS = cpufreq-appl
+@@ -70,7 +71,8 @@ am_cpufreq_applet_OBJECTS = cpufreq-appl
cpufreq-monitor-factory.$(OBJEXT) \
cpufreq-monitor-procfs.$(OBJEXT) \
cpufreq-monitor-sysfs.$(OBJEXT) $(am__objects_1) \
@@ -418,15 +418,7 @@
cpufreq_applet_OBJECTS = $(am_cpufreq_applet_OBJECTS)
am__DEPENDENCIES_1 =
cpufreq_applet_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-@@ -85,6 +87,7 @@ am__depfiles_maybe = depfiles
- @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-libcpufreq.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-procfs.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-sysfs.Po \
-+@AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-sysctl.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-popup.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-prefs.Po \
-@@ -411,6 +414,7 @@ cpufreq_applet_SOURCES = \
+@@ -402,6 +404,7 @@ cpufreq_applet_SOURCES = \
cpufreq-monitor.c cpufreq-monitor.h \
cpufreq-monitor-factory.c cpufreq-monitor-factory.h \
cpufreq-monitor-procfs.c cpufreq-monitor-procfs.h \
@@ -434,7 +426,7 @@
cpufreq-monitor-sysfs.c cpufreq-monitor-sysfs.h \
$(cpufreq_files) \
cpufreq-monitor-cpuinfo.c cpufreq-monitor-cpuinfo.h
-@@ -496,6 +500,7 @@ distclean-compile:
+@@ -487,6 +490,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-factory.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-libcpufreq.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-procfs.Po@am__quote@
diff --git a/x11/gnome-applets/files/patch-cpufreq-selector-freebsd b/x11/gnome-applets/files/patch-cpufreq-selector-freebsd
index 0647e375d529..734bd6c74cea 100644
--- a/x11/gnome-applets/files/patch-cpufreq-selector-freebsd
+++ b/x11/gnome-applets/files/patch-cpufreq-selector-freebsd
@@ -190,9 +190,9 @@
+
+ return TRUE;
+}
---- cpufreq/src/cpufreq-selector/Makefile.in.orig Mon Mar 12 11:58:09 2007
-+++ cpufreq/src/cpufreq-selector/Makefile.in Mon Mar 12 12:12:33 2007
-@@ -58,13 +58,15 @@ am__cpufreq_selector_SOURCES_DIST = cpuf
+--- cpufreq/src/cpufreq-selector/Makefile.in.orig 2007-07-30 21:08:35.000000000 -0400
++++ cpufreq/src/cpufreq-selector/Makefile.in 2007-07-30 21:08:36.000000000 -0400
+@@ -57,13 +57,15 @@ am__cpufreq_selector_SOURCES_DIST = cpuf
cpufreq-selector.h cpufreq-selector-sysfs.c \
cpufreq-selector-sysfs.h cpufreq-selector-procfs.c \
cpufreq-selector-procfs.h cpufreq-selector-libcpufreq.c \
@@ -210,15 +210,7 @@
cpufreq_selector_OBJECTS = $(am_cpufreq_selector_OBJECTS)
am__DEPENDENCIES_1 =
cpufreq_selector_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-@@ -75,6 +77,7 @@ am__depfiles_maybe = depfiles
- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cpufreq-selector-libcpufreq.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-selector-procfs.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-selector-sysfs.Po \
-+@AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-selector-sysctl.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-selector.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/main.Po
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -385,6 +388,7 @@ cpufreq_selector_SOURCES = \
+@@ -381,6 +383,7 @@ cpufreq_selector_SOURCES = \
cpufreq-selector.c cpufreq-selector.h \
cpufreq-selector-sysfs.c cpufreq-selector-sysfs.h \
cpufreq-selector-procfs.c cpufreq-selector-procfs.h \
@@ -226,7 +218,7 @@
$(cpufreq_files) \
main.c
-@@ -466,6 +470,7 @@ distclean-compile:
+@@ -462,6 +465,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-libcpufreq.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-procfs.Po@am__quote@