rpms/gnome-games/devel gnome-games.spec,1.223,1.224
by Matthias Clasen
Author: mclasen
Update of /cvs/pkgs/rpms/gnome-games/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8698
Modified Files:
gnome-games.spec
Log Message:
fix a typo
Index: gnome-games.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -p -r1.223 -r1.224
--- gnome-games.spec 31 Jul 2009 15:07:08 -0000 1.223
+++ gnome-games.spec 1 Aug 2009 01:14:49 -0000 1.224
@@ -46,7 +46,7 @@
Summary: Games for the GNOME desktop
Name: gnome-games
Version: 2.27.5
-Release: 3%{?dist}
+Release: 4%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: Amusements/Games
@@ -117,7 +117,7 @@ in a variety of styles and genres for th
%package extra
Group: Amusements/Games
Summary: More games for the GNOME desktop
-Requires: %{name} = %{epoch}%{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
%description extra
The gnome-games-extra package contains additional small "five-minute" games
@@ -493,6 +493,9 @@ fi
%changelog
+* Fri Jul 31 2009 Matthias Clasen <mclasen(a)redhat.com> 2.27.5-4
+- Fix a typo (#515033)
+
* Fri Jul 31 2009 Matthias Clasen <mclasen(a)redhat.com> 2.27.5-3
- Split off a subset of games to include on the live cd
13Â years, 6Â months
rpms/compiz/devel compiz-pageflip.patch, NONE, 1.1 compiz.spec, 1.173, 1.174
by Kristian Høgsberg
Author: krh
Update of /cvs/pkgs/rpms/compiz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6536
Modified Files:
compiz.spec
Added Files:
compiz-pageflip.patch
Log Message:
* Fri Jul 31 2009 Kristian Høgsberg <krh(a)redhat.com> - 0.8.2-8
- Add patch to add option to always use glXSwapBuffers.
compiz-pageflip.patch:
include/compiz-core.h | 2 ++
src/display.c | 9 +++++++--
src/main.c | 14 +++++++++++++-
src/screen.c | 3 +++
4 files changed, 25 insertions(+), 3 deletions(-)
--- NEW FILE compiz-pageflip.patch ---
diff -up compiz-0.8.2/include/compiz-core.h.flip compiz-0.8.2/include/compiz-core.h
--- compiz-0.8.2/include/compiz-core.h.flip 2009-07-31 13:00:46.120940112 -0400
+++ compiz-0.8.2/include/compiz-core.h 2009-07-31 13:00:57.625815409 -0400
@@ -219,6 +219,8 @@ extern Bool useCow;
extern Bool noDetection;
extern Bool useDesktopHints;
extern Bool onlyCurrentScreen;
+extern Bool noWait;
+extern Bool alwaysSwap;
extern char **initialPlugins;
extern int nInitialPlugins;
diff -up compiz-0.8.2/src/display.c.flip compiz-0.8.2/src/display.c
--- compiz-0.8.2/src/display.c.flip 2009-07-31 13:00:46.121940240 -0400
+++ compiz-0.8.2/src/display.c 2009-07-31 13:00:57.627815245 -0400
@@ -1488,6 +1488,9 @@ eventLoop (void)
s->idle ? s->redrawTime :
timeDiff);
+ if (alwaysSwap == TRUE)
+ damageScreen (s);
+
/* substract top most overlay window region */
if (s->overlayWindowCount)
{
@@ -1547,9 +1550,11 @@ eventLoop (void)
targetScreen = NULL;
targetOutput = &s->outputDev[0];
- waitForVideoSync (s);
+ if (!noWait)
+ waitForVideoSync (s);
- if (mask & COMP_SCREEN_DAMAGE_ALL_MASK)
+ if ((mask & COMP_SCREEN_DAMAGE_ALL_MASK) ||
+ (alwaysSwap == TRUE))
{
glXSwapBuffers (d->display, s->output);
}
diff -up compiz-0.8.2/src/main.c.flip compiz-0.8.2/src/main.c
--- compiz-0.8.2/src/main.c.flip 2009-07-31 13:00:46.122940228 -0400
+++ compiz-0.8.2/src/main.c 2009-07-31 13:00:57.628820890 -0400
@@ -67,6 +67,8 @@ Bool noDetection = FALSE;
Bool useDesktopHints = FALSE;
Bool onlyCurrentScreen = FALSE;
static Bool debugOutput = FALSE;
+Bool noWait = FALSE;
+Bool alwaysSwap = FALSE;
#ifdef USE_COW
Bool useCow = TRUE;
@@ -89,7 +91,9 @@ usage (void)
"[--replace]\n "
"[--sm-disable] "
"[--sm-client-id ID] "
- "[--only-current-screen]\n "
+ "[--only-current-screen] "
+ "[--no-wait]\n "
+ "[--always-swap] "
#ifdef USE_COW
" [--use-root-window] "
@@ -376,6 +380,14 @@ main (int argc, char **argv)
if (i + 1 < argc)
backgroundImage = argv[++i];
}
+ else if (!strcmp (argv[i], "--no-wait"))
+ {
+ noWait = TRUE;
+ }
+ else if (!strcmp (argv[i], "--always-swap"))
+ {
+ alwaysSwap = TRUE;
+ }
else if (*argv[i] == '-')
{
compLogMessage ("core", CompLogLevelWarn,
diff -up compiz-0.8.2/src/screen.c.flip compiz-0.8.2/src/screen.c
--- compiz-0.8.2/src/screen.c.flip 2009-02-15 14:26:28.000000000 -0500
+++ compiz-0.8.2/src/screen.c 2009-07-31 13:00:57.631815337 -0400
@@ -2422,6 +2422,9 @@ void
damageScreenRegion (CompScreen *screen,
Region region)
{
+ if (alwaysSwap)
+ damageScreen (screen);
+
if (screen->damageMask & COMP_SCREEN_DAMAGE_ALL_MASK)
return;
Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -p -r1.173 -r1.174
--- compiz.spec 24 Jul 2009 19:21:31 -0000 1.173
+++ compiz.spec 1 Aug 2009 01:04:45 -0000 1.174
@@ -14,7 +14,7 @@ URL: http://www.go-compiz.org
License: GPLv2+ and LGPLv2+ and MIT
Group: User Interface/Desktops
Version: 0.8.2
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: OpenGL window and compositing manager
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -61,6 +61,7 @@ Patch103: composite-cube-logo.patch
Patch105: fedora-logo.patch
Patch106: redhat-logo.patch
Patch107: compiz-0.8.2-wall.patch
+Patch108: compiz-pageflip.patch
#Patch110: scale-key.patch
# update translations in desktop-effects
Patch115: desktop-effects-linguas.patch
@@ -146,6 +147,7 @@ popd
%patch123 -p1 -b .initial-plugins
%patch125 -p1 -b .gnome-terminal
+%patch108 -p1 -b .pageflip
%build
rm -rf $RPM_BUILD_ROOT
@@ -359,6 +361,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Jul 31 2009 Kristian Høgsberg <krh(a)redhat.com> - 0.8.2-8
+- Add patch to add option to always use glXSwapBuffers.
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.8.2-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
13Â years, 6Â months
rpms/php-getid3/devel ampache.patch, NONE, 1.1 import.log, NONE, 1.1 php-getid3.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Paulo Roma Cavalcanti
Author: roma
Update of /cvs/pkgs/rpms/php-getid3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1550/devel
Modified Files:
.cvsignore sources
Added Files:
ampache.patch import.log php-getid3.spec
Log Message:
Initial version for F12.
ampache.patch:
module.audio.mp3.php | 2 ++
module.audio.xiph.php | 5 ++++-
module.tag.id3v2.php | 7 ++++---
write.id3v2.php | 5 ++---
4 files changed, 12 insertions(+), 7 deletions(-)
--- NEW FILE ampache.patch ---
diff -Naur getid3/module.audio.mp3.php getid3-new/module.audio.mp3.php
--- getid3/module.audio.mp3.php 2006-11-16 23:57:56.000000000 -0200
+++ getid3-new/module.audio.mp3.php 2009-07-31 20:32:00.000000000 -0300
@@ -1076,6 +1076,8 @@
fseek($fd, $avdata_offset, SEEK_SET);
$sync_seek_buffer_size = min(128 * 1024, $info['avdataend'] - $avdata_offset);
+ // If sync < 1 then resort to default of 128 * 1024
+ if ($sync_seek_buffer_size < 1) { $sync_seek_buffer_size = 128 * 1024; }
$header = fread($fd, $sync_seek_buffer_size);
$sync_seek_buffer_size = strlen($header);
$synch_seek_offset = 0;
diff -Naur getid3/module.audio.xiph.php getid3-new/module.audio.xiph.php
--- getid3/module.audio.xiph.php 2006-12-03 22:12:42.000000000 -0200
+++ getid3-new/module.audio.xiph.php 2009-07-31 20:42:10.000000000 -0300
@@ -849,6 +849,8 @@
public static function OggPageSegmentLength($ogg_info_array, $segment_number=1) {
+
+ if (!is_array($ogg_info_array['segment_table'])) { $ogg_info_array['segment_table'] = array(); }
for ($i = 0; $i < $segment_number; $i++) {
$segment_length = 0;
@@ -859,6 +861,7 @@
}
}
}
+ $segment_length = !$segment_length ? '1' : $segment_length;
return $segment_length;
}
@@ -949,4 +952,4 @@
}
-?>
\ No newline at end of file
+?>
diff -Naur getid3/module.tag.id3v2.php getid3-new/module.tag.id3v2.php
--- getid3/module.tag.id3v2.php 2009-03-08 11:30:10.000000000 -0300
+++ getid3-new/module.tag.id3v2.php 2009-07-31 20:38:37.000000000 -0300
@@ -1928,8 +1928,8 @@
$return_array['genre'][] = $genre_string;
} else {
-
- while (strpos($genre_string, '(') !== false) {
+ //MODIFIED per #466 Bernhard Weyrauch fix endless loop if no )
+ while (strpos($genre_string, '(') !== false AND (strpos($genre_string, ')') !== false)) {
$start_pos = strpos($genre_string, '(');
$end_pos = strpos($genre_string, ')');
@@ -3155,6 +3155,7 @@
'TPE3' => 'conductor',
'TPE4' => 'remixer',
'TPUB' => 'publisher',
+ 'TPOS' => 'disk',
'TRC' => 'isrc',
'TRCK' => 'track',
'TRK' => 'track',
@@ -3280,4 +3281,4 @@
}
-?>
\ No newline at end of file
+?>
diff -Naur getid3/write.id3v2.php getid3-new/write.id3v2.php
--- getid3/write.id3v2.php 2006-12-26 00:44:22.000000000 -0200
+++ getid3-new/write.id3v2.php 2009-07-31 20:32:00.000000000 -0300
@@ -374,9 +374,8 @@
}
// rewrite file - no tag present or new tag longer than old tag
- else
-
- if (!$fp_source = @fopen($this->filename, 'rb')) {
+ else {
+ if (!$fp_source = @fopen($this->filename, 'rb')) {
throw new getid3_exception('Could not open '.$this->filename.' mode "rb"');
}
fseek($fp_source, $engine->info['avdataoffset'], SEEK_SET);
--- NEW FILE import.log ---
php-getid3-2_0_0b5-2_fc10:HEAD:php-getid3-2.0.0b5-2.fc10.src.rpm:1249086896
--- NEW FILE php-getid3.spec ---
Name: php-getid3
Version: 2.0.0b5
Release: 2%{?dist}
License: GPLv2
Summary: The PHP media file parser
Group: Development/Libraries
URL: http://getid3.sourceforge.net/
Source0: http://downloads.sourceforge.net/getid3/getid3-%{version}.zip
Patch0: ampache.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: php >= 5.0.0
BuildArch: noarch
%description
getID3() is a PHP script that extracts useful information
(such as ID3 tags, bitrate, playtime, etc.) from MP3s &
other multimedia file formats (Ogg, WMA, WMV, ASF, WAV, AVI,
AAC, VQF, FLAC, MusePack, Real, QuickTime, Monkey's Audio, MIDI and more).
%prep
%setup -q -c
%patch0 -p0 -b .ampache
for i in ./*.txt demos/*.php; do
iconv -f iso-8859-1 -t utf-8 < "$i" > "${i}_"
touch -r "$i" "${i}_"
mv "${i}_" "$i"
done
sed -i 's/\r//' demos/index.php
sed -i 's/\r//' demos/demo.mysql.structure.sql
%build
%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_datadir}/php
cp -a getid3 %{buildroot}%{_datadir}/php/
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc *.txt demos
%{_datadir}/php/getid3
%changelog
* Fri Jul 31 2009 Paulo Roma <roma(a)lcg.ufrj.br> 2.0.0b5-2
- Updated ampache patch.
* Thu Jun 04 2009 Paulo Roma <roma(a)lcg.ufrj.br> 2.0.0b5-1
- Updated to 2.0.0b5
- Patched with ampache fixes.
* Thu Jun 04 2009 Paulo Roma <roma(a)lcg.ufrj.br> 1.7.9-1
- Initial spec file.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-getid3/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore 10 Jun 2009 04:51:24 -0000 1.1
+++ .cvsignore 1 Aug 2009 00:35:28 -0000 1.2
@@ -0,0 +1 @@
+getid3-2.0.0b5.zip
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-getid3/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources 10 Jun 2009 04:51:24 -0000 1.1
+++ sources 1 Aug 2009 00:35:28 -0000 1.2
@@ -0,0 +1 @@
+d2b24ccb4bd4a5c135517bd0ae3b2dd3 getid3-2.0.0b5.zip
13Â years, 6Â months
rpms/filelight/devel .cvsignore, 1.2, 1.3 filelight.spec, 1.10, 1.11 sources, 1.2, 1.3
by Neal Becker
Author: nbecker
Update of /cvs/pkgs/rpms/filelight/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30262
Modified Files:
.cvsignore filelight.spec sources
Log Message:
Updates for kde4
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/filelight/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 17 Sep 2006 20:07:14 -0000 1.2
+++ .cvsignore 1 Aug 2009 00:15:30 -0000 1.3
@@ -1 +1 @@
-filelight-1.0.tar.bz2
+filelight-1.9-rc2.tgz
Index: filelight.spec
===================================================================
RCS file: /cvs/pkgs/rpms/filelight/devel/filelight.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- filelight.spec 31 Jul 2009 23:27:50 -0000 1.10
+++ filelight.spec 1 Aug 2009 00:15:30 -0000 1.11
@@ -2,17 +2,18 @@
Summary: Graphical disk usage statistics
Name: filelight
-Version: 1.9rc2
-Release: 16%{?dist}
+Version: 1.9
+Release: 2.rc2%{?dist}
License: GPLv2+
Group: Applications/System
URL: http://www.methylblue.com/filelight/
-Source: http://www.methylblue.com/filelight/packages/filelight-%{version}.tgz
-Patch0: filelight.desktop.patch
+%define upstreamversion %{version}-rc2
+Source: http://www.methylblue.com/filelight/packages/filelight-%{upstreamversion}...
+#Patch0: filelight.desktop.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: kdelibs4-devel bkebase4-devel desktop-file-utils
+BuildRequires: kdelibs-devel kdebase-devel desktop-file-utils qimageblitz-devel
Requires: hicolor-icon-theme
%description
@@ -23,13 +24,16 @@ with each segment's size being proportio
directories having child segments.
%prep
-%setup -q -n %{name}-%{version}
-%patch0 -b .orig
+%setup -q -n %{name}-%{upstreamversion}
+pushd misc
+sed -i -e 's/MimeType/#MimeType/' filelight_part.desktop
+popd
%build
-source "/etc/profile.d/qt.sh"
-%configure --disable-rpath #--with-pic
-%{__make} %{?_smp_mflags} RPM_OPT_FLAGS="%{optflags}"
+%{cmake_kde4}
+
+make %{?_smp_mflags} VERBOSE=1
+
%install
%{__rm} -rf %{buildroot}
@@ -37,10 +41,15 @@ source "/etc/profile.d/qt.sh"
%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}
%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install \
- --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/kde \
- --add-category="X-Fedora" --vendor="" \
+ --dir ${RPM_BUILD_ROOT}%{_kde4_datadir}/applications/kde4 \
+ --vendor="" \
--delete-original \
- ${RPM_BUILD_ROOT}%{_datadir}/applications/kde/filelight.desktop
+ ${RPM_BUILD_ROOT}%{_kde4_datadir}/applications/kde4/filelight.desktop
+
+desktop-file-install --vendor="" \
+ --dir=$RPM_BUILD_ROOT%{_kde4_datadir}/kde4/services \
+ $RPM_BUILD_ROOT%{_kde4_datadir}/kde4/services/filelight_part.desktop
+
%post
touch --no-create %{_datadir}/icons/hicolor || :
@@ -63,16 +72,20 @@ fi
#%doc %{_docdir}/HTML/en/filelight/
%config(noreplace) %{_datadir}/config/filelightrc
%{_bindir}/filelight
-%{_datadir}/applications/kde/filelight.desktop
-%{_datadir}/apps/filelight/
-%{_datadir}/icons/crystalsvg/*/actions/view_filelight.png
-%{_datadir}/icons/hicolor/*/apps/filelight.png
-%{_datadir}/services/filelight_part.desktop
-%{_libdir}/kde3/libfilelight.la
-%{_libdir}/kde3/libfilelight.so
+%{_kde4_datadir}/applications/kde4/filelight.desktop
+%{_kde4_libdir}/kde4/filelightpart.so
+%{_kde4_datadir}/kde4/apps/filelightpart/
+%{_kde4_appsdir}/filelight
+%{_kde4_iconsdir}/hicolor/*/*/filelight.png
+%{_kde4_iconsdir}/hicolor/*/*/view_filelight.png
+%{_kde4_datadir}/kde4/services/filelight*.desktop
+##%{_kde4_iconsdir}/locolor/*/*/filelight.png
%changelog
+* Fri Jul 31 2009 Neal Becker <ndbecker2(a)gmail.com> - 1.9-2.rc2
+- Updates for kde4
+
* Fri Jul 31 2009 Neal Becker <ndbecker2(a)gmail.com> - 1.9rc2-16
- Update to 1.9rc2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/filelight/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 17 Sep 2006 20:07:14 -0000 1.2
+++ sources 1 Aug 2009 00:15:30 -0000 1.3
@@ -1 +1 @@
-aa885e53e09f40e7fdd371395140b957 filelight-1.0.tar.bz2
+bf1a0459997fdd9e2f3cbe6b2b8c0210 filelight-1.9-rc2.tgz
13Â years, 6Â months
rpms/gtk+extra/devel gtk+extra-2.1.1-item.patch, NONE, 1.1 gtk+extra.spec, 1.14, 1.15
by Roy Rankin
Author: rrankin
Update of /cvs/pkgs/rpms/gtk+extra/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29577
Modified Files:
gtk+extra.spec
Added Files:
gtk+extra-2.1.1-item.patch
Log Message:
Add patch to allow compile against gtk2-2.17.5
gtk+extra-2.1.1-item.patch:
gtkitementry.c | 46 ++++++++++++++++++++++++++--------------------
gtkitementry.h | 2 ++
2 files changed, 28 insertions(+), 20 deletions(-)
--- NEW FILE gtk+extra-2.1.1-item.patch ---
diff --git a/gtkextra/gtkitementry.c b/gtkextra/gtkitementry.c
index 0c5426b..6a42880 100644
--- a/gtkextra/gtkitementry.c
+++ b/gtkextra/gtkitementry.c
@@ -251,6 +251,8 @@ gtk_item_entry_init (GtkItemEntry *entry)
{
entry->justification = GTK_JUSTIFY_LEFT;
entry->text_max_size = 0;
+ entry->item_text_size = 0;
+ entry->item_n_bytes = 0;
GTK_ENTRY(entry)->has_frame = FALSE;
g_object_unref(G_OBJECT(GTK_ENTRY(entry)->im_context));
@@ -680,6 +682,7 @@ gtk_entry_real_insert_text (GtkEditable *editable,
gint index;
gint n_chars;
+ GtkItemEntry *ientry = GTK_ITEM_ENTRY (editable);
GtkEntry *entry = GTK_ENTRY (editable);
if (new_text_length < 0)
@@ -693,23 +696,23 @@ gtk_entry_real_insert_text (GtkEditable *editable,
new_text_length = g_utf8_offset_to_pointer (new_text, n_chars) - new_text;
}
- if (new_text_length + entry->n_bytes + 1 > entry->text_size)
+ if (new_text_length + ientry->item_n_bytes + 1 > ientry->item_text_size)
{
- while (new_text_length + entry->n_bytes + 1 > entry->text_size)
+ while (new_text_length + ientry->item_n_bytes + 1 > ientry->item_text_size)
{
- if (entry->text_size == 0)
- entry->text_size = MIN_SIZE;
+ if (ientry->item_text_size == 0)
+ ientry->item_text_size = MIN_SIZE;
else
{
- if (2 * (guint)entry->text_size < MAX_SIZE &&
- 2 * (guint)entry->text_size > entry->text_size)
- entry->text_size *= 2;
+ if (2 * (guint)ientry->item_text_size < MAX_SIZE &&
+ 2 * (guint)ientry->item_text_size > ientry->item_text_size)
+ ientry->item_text_size *= 2;
else
{
- entry->text_size = MAX_SIZE;
- if (new_text_length > (gint)entry->text_size - (gint)entry->n_bytes - 1)
+ ientry->item_text_size = MAX_SIZE;
+ if (new_text_length > (gint)ientry->item_text_size - (gint)ientry->item_n_bytes - 1)
{
- new_text_length = (gint)entry->text_size - (gint)entry->n_bytes - 1;
+ new_text_length = (gint)ientry->item_text_size - (gint)ientry->item_n_bytes - 1;
new_text_length = g_utf8_find_prev_char (new_text, new_text + new_text_length + 1) - new_text;
n_chars = g_utf8_strlen (new_text, new_text_length);
}
@@ -718,19 +721,19 @@ gtk_entry_real_insert_text (GtkEditable *editable,
}
}
- entry->text = g_realloc (entry->text, entry->text_size);
+ entry->text = g_realloc (entry->text, ientry->item_text_size);
}
index = g_utf8_offset_to_pointer (entry->text, *position) - entry->text;
- g_memmove (entry->text + index + new_text_length, entry->text + index, entry->n_bytes - index);
+ g_memmove (entry->text + index + new_text_length, entry->text + index, ientry->item_n_bytes - index);
memcpy (entry->text + index, new_text, new_text_length);
- entry->n_bytes += new_text_length;
+ ientry->item_n_bytes += new_text_length;
entry->text_length += n_chars;
/* NUL terminate for safety and convenience */
- entry->text[entry->n_bytes] = '\0';
+ entry->text[ientry->item_n_bytes] = '\0';
if (entry->current_pos > *position)
entry->current_pos += n_chars;
@@ -752,6 +755,7 @@ gtk_entry_real_delete_text (GtkEditable *editable,
gint end_pos)
{
GtkEntry *entry = GTK_ENTRY (editable);
+ GtkItemEntry *ientry = GTK_ITEM_ENTRY (editable);
if (start_pos < 0)
start_pos = 0;
@@ -763,9 +767,9 @@ gtk_entry_real_delete_text (GtkEditable *editable,
gint start_index = g_utf8_offset_to_pointer (entry->text, start_pos) - entry->text;
gint end_index = g_utf8_offset_to_pointer (entry->text, end_pos) - entry->text;
- g_memmove (entry->text + start_index, entry->text + end_index, entry->n_bytes + 1 - end_index);
+ g_memmove (entry->text + start_index, entry->text + end_index, ientry->item_n_bytes + 1 - end_index);
entry->text_length -= (end_pos - start_pos);
- entry->n_bytes -= (end_index - start_index);
+ ientry->item_n_bytes -= (end_index - start_index);
if (entry->current_pos > start_pos)
entry->current_pos -= MIN (entry->current_pos, end_pos) - start_pos;
@@ -1026,9 +1030,10 @@ static gboolean
gtk_entry_retrieve_surrounding_cb (GtkIMContext *context,
GtkEntry *entry)
{
+ GtkItemEntry *ientry = GTK_ITEM_ENTRY (entry);
gtk_im_context_set_surrounding (context,
entry->text,
- entry->n_bytes,
+ ientry->item_n_bytes,
g_utf8_offset_to_pointer (entry->text, entry->current_pos) - entry->text);
return TRUE;
@@ -1205,6 +1210,7 @@ static PangoLayout *
gtk_entry_create_layout (GtkEntry *entry,
gboolean include_preedit)
{
+ GtkItemEntry *ientry = GTK_ITEM_ENTRY (entry);
PangoLayout *layout = gtk_widget_create_pango_layout (GTK_WIDGET (entry), NULL);
PangoAttrList *tmp_attrs = pango_attr_list_new ();
@@ -1229,7 +1235,7 @@ gtk_entry_create_layout (GtkEntry *entry,
if (entry->visible)
{
- g_string_prepend_len (tmp_string, entry->text, entry->n_bytes);
+ g_string_prepend_len (tmp_string, entry->text, ientry->item_n_bytes);
g_string_insert (tmp_string, cursor_index, preedit_string);
}
else
@@ -1238,7 +1244,7 @@ gtk_entry_create_layout (GtkEntry *entry,
gint preedit_len_chars;
gunichar invisible_char;
- ch_len = g_utf8_strlen (entry->text, entry->n_bytes);
+ ch_len = g_utf8_strlen (entry->text, ientry->item_n_bytes);
preedit_len_chars = g_utf8_strlen (preedit_string, -1);
ch_len += preedit_len_chars;
@@ -1272,7 +1278,7 @@ gtk_entry_create_layout (GtkEntry *entry,
{
if (entry->visible)
{
- pango_layout_set_text (layout, entry->text, entry->n_bytes);
+ pango_layout_set_text (layout, entry->text, ientry->item_n_bytes);
}
else
{
diff --git a/gtkextra/gtkitementry.h b/gtkextra/gtkitementry.h
index 839c2a8..f058c76 100644
--- a/gtkextra/gtkitementry.h
+++ b/gtkextra/gtkitementry.h
@@ -43,6 +43,8 @@ struct _GtkItemEntry
GtkEntry parent;
gint text_max_size;
+ gint16 item_text_size;
+ gint16 item_n_bytes;
GtkJustification justification;
};
Index: gtk+extra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk+extra/devel/gtk+extra.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- gtk+extra.spec 25 Jul 2009 01:39:57 -0000 1.14
+++ gtk+extra.spec 1 Aug 2009 00:13:30 -0000 1.15
@@ -1,6 +1,6 @@
Name: gtk+extra
Version: 2.1.1
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: A library of gtk+ widgets
Summary(fr): Une bibliothèque de widgets gtk+
@@ -10,7 +10,8 @@ URL: http://gtkextra.sourceforge.net/
Source: http://dl.sf.net/scigraphica/gtk+extra-%{version}.tar.gz
Patch: %{name}-%{version}.g_free.diff
Patch1: %{name}-%{version}-deleterow.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch2: %{name}-%{version}-item.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel
@@ -26,8 +27,8 @@ GtkSheet, GtkPlot et GtkIconList
Summary: A library of gtk+ widgets
Summary(fr): Une bibliothèque de widgets gtk+
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: gtk2-devel
+Requires: %{name} = %{version}-%{release}
+Requires: gtk2-devel
%description devel
The %{name}-devel package includes the static libraries, header files,
@@ -47,6 +48,7 @@ qui utilisent les widgets gtk+extra.
%patch -p0
%patch1 -p1
+%patch2 -p1
%build
%configure
@@ -81,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Aug 01 2009 Roy Rankin <rrankin[AT]ihug[DOT]com[DOT]au> - 2.1.1-12
+- Patch to compile with gtk2-2.17.5
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.1.1-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
13Â years, 6Â months
rpms/gnome-panel/devel gnome-panel-about.patch, NONE, 1.1 gnome-panel.spec, 1.361, 1.362 panel-icons.patch, 1.1, 1.2
by Matthias Clasen
Author: mclasen
Update of /cvs/pkgs/rpms/gnome-panel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29098
Modified Files:
gnome-panel.spec panel-icons.patch
Added Files:
gnome-panel-about.patch
Log Message:
Reduce excessive 'about'-ing in the System menu
gnome-panel-about.patch:
panel-menu-items.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- NEW FILE gnome-panel-about.patch ---
diff -up gnome-panel-2.27.4/gnome-panel/panel-menu-items.c.about gnome-panel-2.27.4/gnome-panel/panel-menu-items.c
--- gnome-panel-2.27.4/gnome-panel/panel-menu-items.c.about 2009-07-31 18:29:02.635601324 -0400
+++ gnome-panel-2.27.4/gnome-panel/panel-menu-items.c 2009-07-31 18:30:18.129605780 -0400
@@ -1159,7 +1159,8 @@ panel_desktop_menu_item_append_menu (Gtk
add_menu_separator (menu);
panel_menu_items_append_from_desktop (menu, "gnome-yelp.desktop", NULL);
- panel_menu_items_append_from_desktop (menu, "gnome-about.desktop", NULL);
+ if (panel_has_desktop_file ("about-this-computer.desktop"))
+ panel_menu_items_append_from_desktop (menu, "about-this-computer.desktop", NULL);
if (parent->priv->append_lock_logout)
panel_menu_items_append_lock_logout (menu);
Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.361
retrieving revision 1.362
diff -u -p -r1.361 -r1.362
--- gnome-panel.spec 27 Jul 2009 14:01:58 -0000 1.361
+++ gnome-panel.spec 1 Aug 2009 00:09:52 -0000 1.362
@@ -23,7 +23,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.27.4
-Release: 4%{?dist}
+Release: 5%{?dist}
URL: http://www.gnome.org
Source0: http://download.gnome.org/sources/gnome-panel/2.27/%{name}-%{version}.tar...
@@ -91,12 +91,8 @@ BuildRequires: libtool
Patch0: gnome-panel-2.23.4-vendor.patch
Patch1: gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch
-Patch2: gnome-panel-2.17.91-about-fedora.patch
-Patch4: gnome-panel-2.25.3-search.patch
-# Drop this patch for now, it should have AT LEAST been moved
-# to an upstream bugzilla by now
-#Patch6: gnome-panel-2.16.0-compiz-support.patch
-Patch7: gnome-panel-2.21.92-about-this-computer.patch
+Patch2: gnome-panel-2.25.3-search.patch
+Patch3: gnome-panel-about.patch
# the next three patches belong together
# http://bugzilla.gnome.org/show_bug.cgi?id=470966
@@ -162,10 +158,8 @@ Panel Applets using the libpanel-applet
%patch0 -p1 -b .vendor
%patch1 -p1 -b .speak-to-us-ye-old-wise-fish
-%patch2 -p1 -b .about-fedora
-%patch4 -p0 -b .search
-##%patch6 -p0 -b .compiz-support
-%patch7 -p1 -b .about-this-computer
+%patch2 -p0 -b .search
+%patch3 -p1 -b .about
%patch8 -p1 -b .launcher-desktop-files
%patch9 -p1 -b .desktop-file-monitoring
%patch10 -p1 -b .preferred-apps
@@ -378,6 +372,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Fri Jul 31 2009 Matthias Clasen <mclasen(a)redhat.com> 2.27.4-5
+- Reduce the excessive 'about'-ing in the System menu
+
* Mon Jul 27 2009 Matthias Clasen <mclasen(a)redhat.com> 2.27.4-4
- Drop unneeded direct deps
panel-icons.patch:
menu.c | 2 +-
panel-menu-items.c | 34 +++++++++++++++++++++++-----------
panel-recent.c | 2 +-
3 files changed, 25 insertions(+), 13 deletions(-)
Index: panel-icons.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/panel-icons.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- panel-icons.patch 22 Jul 2009 21:32:55 -0000 1.1
+++ panel-icons.patch 1 Aug 2009 00:09:52 -0000 1.2
@@ -1,6 +1,6 @@
diff -up gnome-panel-2.27.4/gnome-panel/menu.c.panel-icons gnome-panel-2.27.4/gnome-panel/menu.c
--- gnome-panel-2.27.4/gnome-panel/menu.c.panel-icons 2009-07-01 09:06:23.000000000 -0400
-+++ gnome-panel-2.27.4/gnome-panel/menu.c 2009-07-22 16:36:34.928388257 -0400
++++ gnome-panel-2.27.4/gnome-panel/menu.c 2009-07-31 18:31:52.836622831 -0400
@@ -1389,7 +1389,7 @@ create_submenu_entry (GtkWidget
{
GtkWidget *menuitem;
@@ -11,8 +11,8 @@ diff -up gnome-panel-2.27.4/gnome-panel/
panel_menu_icon_get_size (),
NULL, NULL,
diff -up gnome-panel-2.27.4/gnome-panel/panel-menu-items.c.panel-icons gnome-panel-2.27.4/gnome-panel/panel-menu-items.c
---- gnome-panel-2.27.4/gnome-panel/panel-menu-items.c.panel-icons 2009-07-22 16:36:34.768127904 -0400
-+++ gnome-panel-2.27.4/gnome-panel/panel-menu-items.c 2009-07-22 16:39:57.329131999 -0400
+--- gnome-panel-2.27.4/gnome-panel/panel-menu-items.c.panel-icons 2009-07-31 18:31:52.737846416 -0400
++++ gnome-panel-2.27.4/gnome-panel/panel-menu-items.c 2009-07-31 18:34:05.243598174 -0400
@@ -1,4 +1,5 @@
-/*
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
@@ -95,16 +95,12 @@ diff -up gnome-panel-2.27.4/gnome-panel/
}
-@@ -1158,11 +1170,11 @@ panel_desktop_menu_item_append_menu (Gtk
+@@ -1158,9 +1170,9 @@ panel_desktop_menu_item_append_menu (Gtk
if (add_separator)
add_menu_separator (menu);
- panel_menu_items_append_from_desktop (menu, "gnome-yelp.desktop", NULL);
-- panel_menu_items_append_from_desktop (menu, "gnome-about.desktop", NULL);
-- panel_menu_items_append_from_desktop (menu, "about-fedora.desktop", NULL);
+ panel_menu_items_append_from_desktop (menu, "gnome-yelp.desktop", NULL, FALSE);
-+ panel_menu_items_append_from_desktop (menu, "gnome-about.desktop", NULL, FALSE);
-+ panel_menu_items_append_from_desktop (menu, "about-fedora.desktop", NULL, FALSE);
if (panel_has_desktop_file ("about-this-computer.desktop"))
- panel_menu_items_append_from_desktop (menu, "about-this-computer.desktop", NULL);
+ panel_menu_items_append_from_desktop (menu, "about-this-computer.desktop", NULL, FALSE);
@@ -113,7 +109,7 @@ diff -up gnome-panel-2.27.4/gnome-panel/
panel_menu_items_append_lock_logout (menu);
diff -up gnome-panel-2.27.4/gnome-panel/panel-recent.c.panel-icons gnome-panel-2.27.4/gnome-panel/panel-recent.c
--- gnome-panel-2.27.4/gnome-panel/panel-recent.c.panel-icons 2009-07-01 09:06:23.000000000 -0400
-+++ gnome-panel-2.27.4/gnome-panel/panel-recent.c 2009-07-22 16:36:34.933388684 -0400
++++ gnome-panel-2.27.4/gnome-panel/panel-recent.c 2009-07-31 18:31:52.839621328 -0400
@@ -188,7 +188,7 @@ panel_recent_append_documents_menu (GtkW
GtkWidget *menu_item;
int size;
13Â years, 6Â months