Upgrade textproc/skim to the latest stable version: 1.2.0. This PR depends on PR ports/78260 . Fix: Apply the following patch How-To-Repeat: N/A
Can anyone handle ports/78263, ports/78264, ports/78265 and ports/78266 ? With ports/78260 (scim upgrade) committed, all existing versions of scim dependent in ports will be broken until they are upgraded as well by the above-mentioned PRs. Thanks.
Responsible Changed From-To: freebsd-ports-bugs->clsung Take.
The port was changed during gnome-2.10 upgrade. The old patch was no longer applicable. New patch is: diff -ruN textproc/skim.old/Makefile textproc/skim/Makefile --- textproc/skim.old/Makefile Fri Mar 18 10:03:57 2005 +++ textproc/skim/Makefile Mon Mar 21 20:12:26 2005 @@ -2,12 +2,11 @@ # Date created: 21 July 2004 # Whom: Jie Gao <gaoj@cpsc.ucalgary.ca> # -# $FreeBSD: ports/textproc/skim/Makefile,v 1.13 2005/03/17 11:06:09 ahze Exp $ +# $FreeBSD$ # PORTNAME= skim -PORTVERSION= 1.0.3 -PORTREVISION= 2 +PORTVERSION= 1.2.0 CATEGORIES= textproc kde MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= scim @@ -26,12 +25,14 @@ USE_REINPLACE= yes USE_INC_LIBTOOL_VER= 15 +USE_GNOME= gnomehack + CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" .include <bsd.port.pre.mk> -.if ${ARCH} == "amd64" +.if ${ARCH} == amd64 BROKEN= Does not compile .endif diff -ruN textproc/skim.old/distinfo textproc/skim/distinfo --- textproc/skim.old/distinfo Tue Jan 25 08:43:41 2005 +++ textproc/skim/distinfo Mon Mar 21 20:12:26 2005 @@ -1,2 +1,2 @@ -MD5 (skim-1.0.3.tar.bz2) = 7dc9e8f51d2239a2c8fdeaa256ce4060 -SIZE (skim-1.0.3.tar.bz2) = 1398272 +MD5 (skim-1.2.0.tar.bz2) = 0679961db34d79a4274294733dfc6fe0 +SIZE (skim-1.2.0.tar.bz2) = 1410725 diff -ruN textproc/skim.old/pkg-plist textproc/skim/pkg-plist --- textproc/skim.old/pkg-plist Tue Jan 25 08:43:41 2005 +++ textproc/skim/pkg-plist Mon Mar 21 20:12:26 2005 @@ -1,5 +1,16 @@ bin/scim-panel-kde bin/skim +include/skim/skimglobalactions.h +include/skim/skimkeygrabber.h +include/skim/skimplugin.h +include/skim/skimpluginmanager.h +include/skim/socketserverthread.h +include/skim/utils/kautocmodule.h +include/skim/utils/scimactions.h +include/skim/utils/scimdragableframe.h +include/skim/utils/scimmovehandle.h +include/skim/utils/scimtoolbar.h +include/skim/utils/scimxmlguibuilder.h lib/kde3/kcm_skimplugin_configplugin.la lib/kde3/kcm_skimplugin_configplugin.so lib/kde3/kcm_skimplugin_inputwindow.la @@ -12,8 +23,6 @@ lib/kde3/kcm_skimplugin_scim_hangul.so lib/kde3/kcm_skimplugin_scim_imengines.la lib/kde3/kcm_skimplugin_scim_imengines.so -lib/kde3/kcm_skimplugin_scim_qtimm.la -lib/kde3/kcm_skimplugin_scim_qtimm.so lib/kde3/kcm_skimplugin_scim_smartpinyin.la lib/kde3/kcm_skimplugin_scim_smartpinyin.so lib/kde3/kcm_skimplugin_scim_tables.la @@ -38,6 +47,8 @@ lib/libskim.la lib/libskim.so lib/libskim.so.0 +libdata/pkgconfig/scim_kdeutils.pc +libdata/pkgconfig/skim.pc share/applnk/Utilities/skim.desktop share/apps/skim/mainwindowui.rc share/apps/skim/pics/pin_down.png @@ -45,7 +56,6 @@ share/apps/skim/pics/scim_help.png share/autostart/skim.desktop share/config.kcfg/generictable.kcfg -share/config.kcfg/qtimm.kcfg share/config.kcfg/scim_hangul.kcfg share/config.kcfg/scimkdeconfig.kcfg share/config.kcfg/smartpinyin.kcfg @@ -97,6 +107,7 @@ share/icons/crystalsvg/scalable/apps/skim.svgz share/locale/de/LC_MESSAGES/skim.mo share/locale/fr/LC_MESSAGES/skim.mo +share/locale/it/LC_MESSAGES/skim.mo share/locale/ja/LC_MESSAGES/skim.mo share/locale/ko/LC_MESSAGES/skim.mo share/locale/zh_CN/LC_MESSAGES/skim.mo @@ -107,7 +118,6 @@ share/services/skimconfiguredialog/skimplugin_scim_global_config.desktop share/services/skimconfiguredialog/skimplugin_scim_hangul_config.desktop share/services/skimconfiguredialog/skimplugin_scim_imengines_config.desktop -share/services/skimconfiguredialog/skimplugin_scim_qtimm_config.desktop share/services/skimconfiguredialog/skimplugin_scim_smartpinyin_config.desktop share/services/skimconfiguredialog/skimplugin_scim_table_config.desktop share/services/skimconfiguredialog/skimplugin_scim_x_config.desktop @@ -121,10 +131,11 @@ share/servicetypes/skimplugin.desktop share/servicetypes/skimui.desktop @cwd %%X11BASE%% -lib/scim-1.0/1.0.0/Config/kconfig.la -lib/scim-1.0/1.0.0/Config/kconfig.so -lib/scim-1.0/1.0.0/Config/kconfig.so.0 +lib/scim-1.0/1.2.0/Config/kconfig.la +lib/scim-1.0/1.2.0/Config/kconfig.so @cwd %%LOCALBASE%% +@dirrm include/skim/utils +@dirrm include/skim @dirrm share/services/skimconfiguredialog @dirrm share/doc/HTML/en/skim @dirrm share/doc/HTML/de/skim
State Changed From-To: open->closed Committed, Thank you.