rpms/tgif/EL-5 tgif-QPL-4.1.45-size-debug.patch, NONE, 1.1 sources, 1.2, 1.3 tgif.spec, 1.2, 1.3 tgif-4.1.35-overthespot_fix.patch, 1.1, NONE tgif-4.1.41.ja.po, 1.1, NONE tgif-4.1.44-xim-bad-focus.patch, 1.1, NONE tgif-4.1.45-fontcheck.patch, 1.1, NONE tgif-wrapper.sh, 1.1, NONE

tremble tremble at fedoraproject.org
Sat Mar 20 12:41:37 UTC 2010 

Author: tremble

Update of /cvs/pkgs/rpms/tgif/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv556

Modified Files:
	sources tgif.spec 
Added Files:
	tgif-QPL-4.1.45-size-debug.patch 
Removed Files:
	tgif-4.1.35-overthespot_fix.patch tgif-4.1.41.ja.po 
	tgif-4.1.44-xim-bad-focus.patch tgif-4.1.45-fontcheck.patch 
	tgif-wrapper.sh 
Log Message:
update tgif in line with rawhide

tgif-QPL-4.1.45-size-debug.patch:
 chat.c    |   14 ++++++++++----
 cmd.c     |    4 +++-
 font.c    |    8 +++++---
 stretch.c |    8 +++++---
 tdgtbtn.c |    2 +-
 5 files changed, 24 insertions(+), 12 deletions(-)

--- NEW FILE tgif-QPL-4.1.45-size-debug.patch ---
--- tgif-QPL-4.1.45/chat.c.debug	2006-06-14 07:29:57.000000000 +0900
+++ tgif-QPL-4.1.45/chat.c	2008-03-11 03:59:04.000000000 +0900
@@ -350,10 +350,11 @@
          case TDGTNF_MULTI_BTN_CLICKED:
             if (tdgt_notify.ctl_id == ID_CHAT_BTN_COLOR) {
                int color_index=INVALID;
+               char c_tmp;
 
                switch (tdgt_notify.nf_arg) { /* Button[1-3] */
                case Button1:
-                  color_index = (int)TdgtBtnGetText(
+                  color_index = (int)*TdgtBtnGetText(
                         gstChatInfo.btn_ctl[CHAT_BTN_COLOR]);
                   if (++color_index >= maxColors) color_index = 0;
                   break;
@@ -361,13 +362,14 @@
                   color_index = tdgt_notify.nf_arg2;
                   break;
                case Button3:
-                  color_index = (int)TdgtBtnGetText(
+                  color_index = (int)*TdgtBtnGetText(
                         gstChatInfo.btn_ctl[CHAT_BTN_COLOR]);
                   if (--color_index < 0) color_index = maxColors-1;
                   break;
                }
+               c_tmp = (char) color_index;
                TdgtBtnSetText(gstChatInfo.btn_ctl[CHAT_BTN_COLOR],
-                     (char*)color_index, NULL);
+                     &c_tmp, NULL);
                TdgtSmplEditSetColorIndex(gstChatInfo.edit_ctl, color_index);
                tgWriteProfileString("User", "Color",
                      colorMenuItems[color_index], gstChatInfo.ini_fname);
@@ -589,6 +591,8 @@
    int new_alloc=FALSE, ival=0, font_style=STYLE_NR;
    int is_bold=FALSE, is_italic=FALSE, color_index=colorIndex;
 
+   char c_tmp;
+
    if ((buf=tgGetProfileString("User", "Color", gstChatInfo.ini_fname)) !=
          NULL) {
       color_index = QuickFindColorIndex(NULL, buf, &new_alloc, TRUE);
@@ -685,6 +689,8 @@
          0, 0, TGMUTYPE_TEXT, TDGTBTN_CLICK, TGBS_NORMAL, STYLE_NR, "Send",
          &mosi);
 
+   c_tmp = (char) color_index;
+
    mosi.one_line_status = FALSE;
    UtilStrCpyN(mosi.btn_str[0], sizeof(mosi.btn_str[0]), colorMouseStatus[0].l);
    UtilStrCpyN(mosi.btn_str[1], sizeof(mosi.btn_str[1]), colorMouseStatus[0].m);
@@ -695,7 +701,7 @@
          gstChatInfo.btn_win_info[CHAT_BTN_COLOR].w,
          gstChatInfo.btn_win_info[CHAT_BTN_COLOR].h,
          0, 0, TGMUTYPE_COLOR, TDGTBTN_CLICK, TGBS_NORMAL, INVALID,
-         (char*)color_index, &mosi);
+         &c_tmp, &mosi);
 
    gstChatInfo.edit_ctl = CreateTdgtSmplEdit(chatWindow, NULL, ID_CHAT_EDIT,
          gstChatInfo.edit_win_info.x, gstChatInfo.edit_win_info.y,
--- tgif-QPL-4.1.45/cmd.c.debug	2006-06-14 07:29:57.000000000 +0900
+++ tgif-QPL-4.1.45/cmd.c	2008-03-11 02:49:42.000000000 +0900
@@ -794,10 +794,12 @@
       int count=0;
 
       if (CmdPtr->pos_before_has_ids) {
+         char c_tmp;
          for (obj_ptr=topObj; obj_ptr != NULL; obj_ptr=next_obj) {
             next_obj = obj_ptr->next;
+            c_tmp = (char) (CmdPtr->pos_before[count]);
             if (ObjHasFullID(obj_ptr,
-                  (char*)(int)(CmdPtr->pos_before[count]))) {
+                  &c_tmp)) {
                count++;
                sel_ptr->obj = obj_ptr;
                if (!obj_ptr->locked) MoveObj(obj_ptr, dx, dy);
--- tgif-QPL-4.1.45/font.c.debug	2008-03-11 03:54:02.000000000 +0900
+++ tgif-QPL-4.1.45/font.c	2008-03-11 03:54:02.000000000 +0900
@@ -20,6 +20,8 @@
 
 #define _INCLUDE_FROM_FONT_C_
 
+#include <ctype.h>
+
 #include "tgifdefs.h"
 #include "cmdids.h"
 
@@ -372,15 +374,15 @@
    char *font_name;
    int dbflag;
 {
-   unsigned char c;
-   unsigned char *buf, *dist, *src;
+   char c;
+   char *buf, *dist, *src;
    char **font_list;
    int  actual_count_return;
 
    if (!font_name)
        return False;
 
-   buf = (unsigned char*)malloc (strlen(font_name) + 3);
+   buf = malloc (strlen(font_name) + 3);
    if (!buf)
        return False;
 
--- tgif-QPL-4.1.45/stretch.c.debug	2006-06-14 07:29:59.000000000 +0900
+++ tgif-QPL-4.1.45/stretch.c	2008-03-11 03:07:59.000000000 +0900
@@ -386,6 +386,7 @@
    *pn_num_to_resize = 0;
    for (sel_ptr=botSel; sel_ptr != NULL; sel_ptr=sel_ptr->prev) {
       struct AttrRec *name_attr=NULL;
+      char c_tmp;
 
       if (HasOnResize(sel_ptr->obj, &name_attr) && name_attr != NULL) {
          num_to_resize++;
@@ -396,7 +397,8 @@
                   num_to_resize*sizeof(char*));
          }
          if (ppsz_names == NULL) FailAllocMessage();
-         ppsz_names[num_to_resize-1] = (char*)(sel_ptr->obj->id);
+         c_tmp = (char) (sel_ptr->obj->id);
+         ppsz_names[num_to_resize-1] = &c_tmp;
       }
    }
    if (num_to_resize == 0) return NULL;
@@ -429,7 +431,7 @@
    RemoveAllSel();
    for (i=0; i < num_to_resize; i++) {
       struct AttrRec *exec_attr=NULL;
-      struct ObjRec *obj_ptr=FindObjWithOID((int)(ppsz_names[i]));
+      struct ObjRec *obj_ptr=FindObjWithOID((int)(*ppsz_names[i]));
 
       if (obj_ptr != NULL && !SkipOnResize(obj_ptr)) {
          exec_attr = FindAttrWithName(obj_ptr, "on_resize=", NULL);
@@ -445,7 +447,7 @@
       }
    }
    for (i=0; i < num_to_resize; i++) {
-      struct ObjRec *obj_ptr=FindObjWithOID((int)(ppsz_names[i]));
+      struct ObjRec *obj_ptr=FindObjWithOID((int)(*ppsz_names[i]));
 
       if (obj_ptr != NULL) {
          if (!AlreadySelected(obj_ptr)) {
--- tgif-QPL-4.1.45/tdgtbtn.c.debug	2006-06-14 07:29:59.000000000 +0900
+++ tgif-QPL-4.1.45/tdgtbtn.c	2008-03-11 03:14:25.000000000 +0900
@@ -129,7 +129,7 @@
       break;
    case TGMUTYPE_COLOR:
       if (colorDisplay) {
-         pixel = (btn_down ? myFgPixel : colorPixels[(int)(pTdgtBtn->str)]);
+         pixel = (btn_down ? myFgPixel : colorPixels[(unsigned int)(*pTdgtBtn->str)]);
       } else {
          pixel = myFgPixel;
       }


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tgif/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	9 Jul 2007 18:08:27 -0000	1.2
+++ sources	20 Mar 2010 12:41:36 -0000	1.3
@@ -1,2 +1 @@
-da4d40a12c5053ed73336e041e7a6a93  tgif-4.1ja9.tar.gz
-5c1eba8291385c630b8099fa9b042455  tgif-QPL-4.1.45.tar.gz
+8ec70553a1526fb6ee65cd4e81593363  tgif-QPL-4.2.2.tar.gz


Index: tgif.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tgif/EL-5/tgif.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- tgif.spec	11 Jul 2007 12:54:54 -0000	1.2
+++ tgif.spec	20 Mar 2010 12:41:36 -0000	1.3
@@ -1,34 +1,28 @@
-%define		Xresource_ja_ver	4.1ja9
-
 Name:		tgif
-Version:	4.1.45
-Release:	4%{?dist}
+Version:	4.2.2
+Release:	1%{?dist}
 Summary:	2-D drawing tool
 Group:		Applications/Multimedia
 
 License:	QPL
 URL:		http://bourbon.usc.edu/tgif/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-QPL-%{version}.tar.gz
-# Borrowed from Vine Linux
-Source1:	tgif-%{Xresource_ja_ver}.tar.gz
-Source2:	tgif-4.1.41.ja.po
-Source3:	tgif.desktop
-Source4:	http://bourbon.usc.edu/tgif/images/%{name}.gif
-Source5:	tgif-wrapper.sh
-Patch1:		tgif-4.1.45-fontcheck.patch
-Patch3:		tgif-4.1.35-overthespot_fix.patch
 # http://tyche.pu-toyama.ac.jp/~a-urasim/tgif/
 Patch10:	tgif-textcursor-a-urasim.patch
-Patch20:	tgif-4.1.44-xim-bad-focus.patch
+# Check below later
+Patch101:	tgif-QPL-4.1.45-size-debug.patch
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
 
-BuildRequires:	ImageMagick
 BuildRequires:	imake
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 BuildRequires:	libXmu-devel
+BuildRequires:	libidn-devel
+BuildRequires:	zlib-devel
 Requires:	ghostscript
 Requires:	netpbm-progs
+Requires:	xorg-x11-fonts-75dpi
+Requires:	xorg-x11-fonts-ISO8859-1-75dpi
 
 %description
 Tgif  -  Xlib based interactive 2-D drawing facility under
@@ -38,25 +32,31 @@ hyper-graphics (or hyper-structured-grap
 the World-Wide-Web.
 
 %prep
-%setup -q -n %{name}-QPL-%{version} -a 1
-%patch1 -p1 -b .fontcheck
-%patch3 -p1 -b .overthespot
-%patch10 -p0 -b textcursor
-%patch20 -p1 -b .xim-bad-focus
+%setup -q -n %{name}-QPL-%{version}
+# Upstream says the below is wrong, for now dropping
+#%%patch10 -p0 -b textcursor
+# Check later
+#%%patch101 -p1 -b .size
 
-%{__cp} -pf %{SOURCE2} po/ja/ja.po
-pushd po/ja
 %{__perl} -pi \
 	-e 's,JISX-0208-1983-0,EUC-JP,g' \
-	ja.po
-popd
+	po/ja/ja.po
 
 # use scalable bitmap font
-for i in C ja ; do
-  %{__sed} -e s,alias\-mincho,misc\-mincho,g \
-           -e s,alias\-gothic,jis\-fixed,g \
-           -i tgif-%{Xresource_ja_ver}/${i}/Tgif.ad
-done
+%{__sed} \
+	-e s,alias\-mincho,misc\-mincho,g \
+	-e s,alias\-gothic,jis\-fixed,g \
+	-i po/ja/Tgif.ad
+
+# Fix desktop file
+%{__sed} -i.icon -e 's|Icon=tgif|Icon=tgificon|' \
+	po/ja/tgif.desktop
+
+# Fix installation path for icon files
+%{__sed} -i.path \
+	-e '/InstallNonExec.*hicolor/s|\$(TGIFDIR)|\$(DATADIR)/icons/|' \
+	-e '/MakeDirectories.*hicolor/s|\$(TGIFDIR)|\$(DATADIR)/icons/|' \
+	Imakefile
 
 %build
 %{__cp} -pf Tgif.tmpl-linux Tgif.tmpl
@@ -84,25 +84,30 @@ popd
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT/
-# wrap xgif
+
 %{__make} \
 	DESTDIR=$RPM_BUILD_ROOT/ \
 	BINDIR=%{_libexecdir}/ \
 	TGIFDIR=%{_datadir}/tgif/ \
 	INSTALLFLAGS="-cp" \
+	DATADIR=%{_datadir} \
 	install \
 	install.man
+
+# wrap tgif
 %{__mkdir_p} $RPM_BUILD_ROOT%{_bindir}/
-%{__install} -cpm 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}/%{name}
+%{__install} -cpm 0755 po/ja/tgif-wrapper.sh \
+	$RPM_BUILD_ROOT%{_bindir}/%{name}
 
 %{__rm} -f $RPM_BUILD_ROOT%{_datadir}/tgif/*.obj
 %{__install} -cpm 0644 *.obj \
 	$RPM_BUILD_ROOT%{_datadir}/tgif/
 
-%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/X11/{,ja/}app-defaults/
-%{__install} -cpm 0644 tgif-%{Xresource_ja_ver}/C/Tgif.ad \
-	$RPM_BUILD_ROOT%{_datadir}/X11/app-defaults/Tgif
-%{__install} -cpm 0644 tgif-%{Xresource_ja_ver}/ja/Tgif.ad \
+
+# Japanese specific
+%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/X11/ja/app-defaults/
+%{__install} -cpm 0644 \
+	po/ja/Tgif.ad \
 	$RPM_BUILD_ROOT%{_datadir}/X11/ja/app-defaults/Tgif
 
 pushd po
@@ -119,12 +124,8 @@ desktop-file-install \
 	--remove-category 'X-Fedora' \
 	--vendor 'fedora' \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
-	%{SOURCE3}
+	po/ja/tgif.desktop
 
-%{__mkdir_p} %{buildroot}%{_datadir}/pixmaps/
-convert -geometry 64x64! %{SOURCE4} %{name}.png
-%{__install} -cpm644 %{name}.png \
-	$RPM_BUILD_ROOT/%{_datadir}/pixmaps/
 
 %{find_lang} tgif
 
@@ -132,34 +133,89 @@ convert -geometry 64x64! %{SOURCE4} %{na
 %{__rm} -rf $RPM_BUILD_ROOT/
 
 %post
-%{_bindir}/update-desktop-database -q %{_datadir}/applications/ ||:
+touch --no-create %{_datadir}/icons/hicolor
+update-desktop-database -q %{_datadir}/applications/
+exit 0
 
 %postun
-%{_bindir}/update-desktop-database -q %{_datadir}/applications/ ||:
+update-desktop-database -q %{_datadir}/applications/
+
+[ $1 -eq 0 ] || exit 0
+touch --no-create %{_datadir}/icons/hicolor
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+exit 0
+
+%posttrans
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+exit 0
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc Copyright HISTORY LICENSE.QPL
-%doc README* 
+%doc AUTHORS
+%doc ChangeLog
+%doc Copyright
+%doc HISTORY
+%doc LICENSE.QPL
+%doc README*
 %doc VMS_MAKE_TGIF.COM 
 %doc example.tex 
-%doc %{name}-%{Xresource_ja_ver}/README.jp
+%doc po/ja/README.jp
 
 %{_bindir}/%{name}
 %{_libexecdir}/%{name}
 %{_mandir}/man1/%{name}.1x*
 
 %{_datadir}/%{name}/
-%{_datadir}/X11/app-defaults/Tgif
 # Currently no package owns the following directories
 %dir %{_datadir}/X11/ja/
 %dir %{_datadir}/X11/ja/app-defaults/
 %{_datadir}/X11/ja/app-defaults/Tgif
 
-%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/icons/hicolor/*/apps/%{name}icon.png
 %{_datadir}/applications/*-%{name}.desktop
 
 %changelog
+* Sat Nov 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.2.2-1
+- 4.2.2
+
+* Thu Oct 15 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.2.1-1
+- Bug fix release 4.2.1
+
+* Thu Oct  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.2-1
+- Update to 4.2
+  * Almost all patches/sources/etc in Fedora rpms (actually borrowed
+    from Vine Project) were applied upstream
+  * Stop to apply 1 left patch for now
+  * 1 patch does not apply, check later
+
+* Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.1.45-10
+- F-12: Mass rebuild
+
+* Tue Feb 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.1.45-9
+- F-11: Mass rebuild
+
+* Sat Nov 15 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.1.45-8
+- Add fonts Requirement against xorg-x11-fonts-ISO8859-1-75dpi
+
+* Fri Aug 29 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.1.45-7
+- Fuzz up
+
+* Mon Mar 17 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.1.45-6
+- Require xorg-x11-fonts-75dpi
+- Try to clean up size difference 
+- Don't ship Japanese related Tgif.ad for non Japanese
+  locale (may fix bug 436644, 427806?)
+
+* Sat Feb  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- Rebuild against gcc43 (F-9)
+
+* Wed Aug 22 2007 TASAKA Mamoru <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.1.45-5
+- Set mode explicitly when open(2) is used with O_CREAT
+  due to recent glibc change
+
+* Wed Aug 22 2007 TASAKA Mamoru <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.1.45-4.dist.1
+- Mass rebuild (buildID or binutils issue)
+
 * Wed Jul 11 2007 MATSUURA Takanori <t.matsuu at gmail.com> - 4.1.45-4
 - based on tgif-4.1.44-0vl6.src.rpm from VineSeed main
 - use scalable bitmap font


--- tgif-4.1.35-overthespot_fix.patch DELETED ---


--- tgif-4.1.41.ja.po DELETED ---


--- tgif-4.1.44-xim-bad-focus.patch DELETED ---


--- tgif-4.1.45-fontcheck.patch DELETED ---


--- tgif-wrapper.sh DELETED ---

More information about the scm-commits mailing list