From owner-freebsd-ports Sat May 20 18: 5: 1 2000 Delivered-To: freebsd-ports@freebsd.org Received: from sabami.seaslug.org (ip18.gte13.rb1.bel.nwlink.com [207.202.150.18]) by hub.freebsd.org (Postfix) with ESMTP id 96C3537B7E1; Sat, 20 May 2000 18:04:56 -0700 (PDT) (envelope-from scott@sabmail.rresearch.com) Received: from sabmail.rresearch.com (ip18.gte13.rb1.bel.nwlink.com [207.202.150.18]) by sabami.seaslug.org (Postfix) with SMTP id 87A981F7C; Sat, 20 May 2000 18:06:05 -0700 (PDT) To: Will Andrews Cc: FreeBSD Ports , Satoshi Asami Subject: Re: **HEADS UP** KDE2 -> ports tree References: <20000515010219.B53719@argon.blackdawn.com> <20000515234230.A98535@argon.blackdawn.com> <20000517061510.D27192@argon.blackdawn.com> Reply-To: scott@sabami.seaslug.org From: Scott Blachowicz Date: 20 May 2000 18:06:05 -0700 In-Reply-To: Will Andrews's message of "Wed, 17 May 2000 06:15:10 -0400" Message-ID: <87hfbsn24i.fsf@sabmail.rresearch.com> Lines: 86 User-Agent: Gnus/5.0805 (Gnus v5.8.5) XEmacs/21.1 (Canyonlands) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >>>>> "Will" == Will Andrews Will> kdetoys2 is awaiting a commit pending its successful compile. However, Will> all other kde2-related ports have been committed (kde-qt-addon, kdelibs, Will> kdebase, kdesupport, kdegames, kdenetwork, and koffice). Speaking of which...I am assuming that since the port Makefile is referending kdetoys-1.90 that it should be ready to go. I just did a build (off /usr/ports tree just cvsup-updated) and got this out: >> kdetoys-1.90.tar.bz2 doesn't seem to exist on this system. >> Attempting to fetch from ftp://ftp.us.kde.org/pub/kde/unstable/distribution/tar/src/. fetch: pub/kde/unstable/distribution/tar/src/kdetoys-1.90.tar.bz2: cannot get remote modification time fetch: ftp://ftp.us.kde.org/pub/kde/unstable/distribution/tar/src/kdetoys-1.90.tar.bz2: FTP error: fetch: File unavailable (e.g., file not found, no access) >> Attempting to fetch from ftp://ftp.kde.org/pub/kde/unstable/distribution/tar/src/. Receiving kdetoys-1.90.tar.bz2 (464880 bytes) 464880 bytes transferred in 60.8 seconds (7.46 Kbytes/s) ===> Extracting for kdetoys-1.90 >> Checksum OK for kdetoys-1.90.tar.bz2. ===> kdetoys-1.90 depends on executable: bzip2 - found ===> kdetoys-1.90 depends on executable: gmake - found ===> kdetoys-1.90 depends on executable: gcc295 - found ===> kdetoys-1.90 depends on shared library: kdecore.4 - found ===> kdetoys-1.90 depends on shared library: qt2.3 - found ===> Patching for kdetoys-1.90 ===> Applying FreeBSD patches for kdetoys-1.90 1 out of 3 hunks failed--saving rejects to kmoon/pics/Makefile.in.rej 1 out of 1 hunks failed--saving rejects to kmoon/kmoon.cpp.rej *** Error code 2 Stop. and the rejected patches look like this: *************** *** 157,163 **** x_includes = @x_includes@ x_libraries = @x_libraries@ - pics_DATA = moon1.gif moon14.gif moon19.gif moon22.gif moon27.gif moon5.gif moon10.gif moon15.gif moon23.gif moon9.gif moon28.gif moon6.gif moon11.gif moon16.gif moon2.gif moon24.gif moon29.gif moon7.gif moon12.gif moon17.gif moon20.gif moon25.gif moon3.gif moon8.gif moon13.gif moon18.gif moon21.gif moon26.gif moon4.gif picsdir = $(kde_datadir)/kmoon/pics --- 157,163 ---- x_includes = @x_includes@ x_libraries = @x_libraries@ + pics_DATA = moon1.xpm moon14.xpm moon19.xpm moon22.xpm moon27.xpm moon5.xpm moon10.xpm moon15.xpm moon23.xpm moon9.xpm moon28.xpm moon6.xpm moon11.xpm moon16.xpm moon2.xpm moon24.xpm moon29.xpm moon7.xpm moon12.xpm moon17.xpm moon20.xpm moon25.xpm moon3.xpm moon8.xpm moon13.xpm moon18.xpm moon21.xpm moon26.xpm moon4.xpm picsdir = $(kde_datadir)/kmoon/pics [that pics_DATA line is at line number 192 in Makefile.in, not around line 161] and it's referencing *.png files (not gif or xpm). *************** *** 97,103 **** for (int i = 1; i <= 29; i++) { QString name; - name.sprintf("%s/kmoon/pics/moon%d.gif", KApplication::kde_datadir().data(), i); QImage *p = new QImage(name); --- 97,103 ---- for (int i = 1; i <= 29; i++) { QString name; + name.sprintf("%s/kmoon/pics/moon%d.xpm", KApplication::kde_datadir().data(), i); QImage *p = new QImage(name); The closest thing I can find in that kmoon.cpp file is this: QImage MoonWidget::loadMoon(int index) { QString filename = QString("kmoon/pics/moon%1.png").arg(index); filename = locate("data", filename); return QImage(filename); } so it looks like the above patches are obsolete? -- Scott Blachowicz To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message